Skip to content
Projects
Groups
Snippets
Help
This project
Loading...
Sign in / Register
Toggle navigation
S
supplier
Overview
Overview
Details
Activity
Cycle Analytics
Repository
Repository
Files
Commits
Branches
Tags
Contributors
Graph
Compare
Charts
Issues
0
Issues
0
List
Board
Labels
Milestones
Merge Requests
0
Merge Requests
0
CI / CD
CI / CD
Pipelines
Jobs
Schedules
Charts
Wiki
Wiki
Snippets
Snippets
Members
Collapse sidebar
Close sidebar
Activity
Graph
Charts
Create a new issue
Jobs
Commits
Issue Boards
Open sidebar
王宇航
supplier
Commits
7b53780d
Commit
7b53780d
authored
Oct 16, 2020
by
Wyh
Browse files
Options
Browse Files
Download
Email Patches
Plain Diff
新訂單
Signed-off-by: Wyh <1239658231>
parent
8919d4f9
Hide whitespace changes
Inline
Side-by-side
Showing
14 changed files
with
194 additions
and
81 deletions
+194
-81
base-module/src/main/java/com/gingersoft/gsa/cloud/print/bean/OrderDetails.kt
+8
-1
base-module/src/main/java/com/gingersoft/gsa/cloud/print/bean/WiseposBean.java
+1
-1
delivery_pick_module/src/main/java/com/gingersoft/gsa/delivery_pick_mode/mvp/presenter/SendOrderPresenter.java
+57
-47
delivery_pick_module/src/main/java/com/gingersoft/gsa/delivery_pick_mode/mvp/ui/activity/SendOrderActivity.java
+62
-6
delivery_pick_module/src/main/java/com/gingersoft/gsa/delivery_pick_mode/ui/activity/DeliveryOrderMainActivity.kt
+2
-1
delivery_pick_module/src/main/java/com/gingersoft/gsa/delivery_pick_mode/ui/activity/DeliverySettingActivity.kt
+2
-1
delivery_pick_module/src/main/java/com/gingersoft/gsa/delivery_pick_mode/ui/activity/HistoryOrderActivity.kt
+2
-1
delivery_pick_module/src/main/java/com/gingersoft/gsa/delivery_pick_mode/ui/activity/OrderDetailsActivity.kt
+2
-1
delivery_pick_module/src/main/java/com/gingersoft/gsa/delivery_pick_mode/ui/activity/PayActivity.kt
+2
-1
delivery_pick_module/src/main/java/com/gingersoft/gsa/delivery_pick_mode/ui/base/BaseActivity.kt
+35
-2
delivery_pick_module/src/main/res/layout/other_order_activity_send_order.xml
+7
-5
print-module/src/main/java/com/joe/print/mvp/print/utils/BBposPrint.java
+1
-1
table-module/src/main/java/com/gingersoft/gsa/cloud/table/mvp/presenter/OrderContentPresenter.java
+7
-7
table-module/src/main/java/com/gingersoft/gsa/cloud/table/mvp/ui/adapter/meal/SelectMealAdapter.java
+6
-6
No files found.
base-module/src/main/java/com/gingersoft/gsa/cloud/print/bean/OrderDetails.kt
View file @
7b53780d
...
...
@@ -73,6 +73,7 @@ class OrderDetails {
var
billNo
:
String
?
=
null
var
RECEIVER
:
String
?
=
null
var
TOTAL_AMOUNT
:
String
?
=
null
//後台不會返回
var
order_type
:
Int
=
0
var
orderPayType
:
Int
=
0
//0店內支付,1為貨到付款,2是在線支付
...
...
@@ -99,6 +100,7 @@ class OrderDetails {
var
nowPoints
:
Double
=
0
.
toDouble
()
//現在有多少積分
var
deliveryAmount
:
Double
=
0
.
toDouble
()
//當前運輸工具金額
var
curStat
:
Int
=
0
//訂單已創建 1
// * * Order Assigned To Delivery Man - 配送員已接單 2
// * * Delivery Man Reached Pickup Point Nearby - 配送員已到達店鋪附近 3
// * * Delivery Man Reached Pickup Point - 配送员已到店 4
...
...
@@ -129,15 +131,17 @@ class OrderDetails {
var
child
:
List
<
ChildBeanX
>?
=
null
var
printseting
:
String
?
=
null
var
printToBill
:
Int
=
1
//當金額=0時,是否打印在賬單上 0 否 1 是
//0食品清单打印 账单打印
//1食品清单不打印 账单不打印
//2食品清单打印 账单不打印
//3食品清单不打印 账单打印
var
printTo
:
Int
=
0
var
lunchboxPrice
:
Double
=
0.0
class
ChildBeanX
:
Serializable
{
/**
* odsId : 165448
2
* odsId : 165448
7
* PRICE : 0.0
* num : 2
* pid : 1654481
...
...
@@ -151,7 +155,9 @@ class OrderDetails {
var
PRODUCT_NAME
:
String
?
=
null
var
child
:
List
<
ChildBean
>?
=
null
var
printseting
:
String
?
=
null
var
lunchboxPrice
:
Double
=
0.0
var
printToBill
:
Int
=
1
//當金額=0時,是否打印在賬單上 0 否 1 是
//0食品清单打印 账单打印
//1食品清单不打印 账单不打印
//2食品清单打印 账单不打印
...
...
@@ -171,6 +177,7 @@ class OrderDetails {
var
pid
:
String
?
=
null
var
PRODUCT_NAME
:
String
?
=
null
var
printseting
:
String
?
=
null
var
lunchboxPrice
:
Double
=
0.0
var
printToBill
:
Int
=
1
//當金額=0時,是否打印在賬單上 0 否 1 是
//0食品清单打印 账单打印
//1食品清单不打印 账单不打印
...
...
base-module/src/main/java/com/gingersoft/gsa/cloud/bean/WiseposBean.java
→
base-module/src/main/java/com/gingersoft/gsa/cloud/
print/
bean/WiseposBean.java
View file @
7b53780d
package
com
.
gingersoft
.
gsa
.
cloud
.
bean
;
package
com
.
gingersoft
.
gsa
.
cloud
.
print
.
bean
;
public
class
WiseposBean
{
...
...
delivery_pick_module/src/main/java/com/gingersoft/gsa/delivery_pick_mode/mvp/presenter/SendOrderPresenter.java
View file @
7b53780d
...
...
@@ -3,10 +3,10 @@ package com.gingersoft.gsa.delivery_pick_mode.mvp.presenter;
import
android.app.Application
;
import
com.gingersoft.gsa.cloud.base.application.GsaCloudApplication
;
import
com.gingersoft.gsa.cloud.base.order.bean.OrderDetail
;
import
com.gingersoft.gsa.cloud.base.order.bean.mealManger.MyOrderManage
;
import
com.gingersoft.gsa.cloud.base.utils.other.TextUtil
;
import
com.gingersoft.gsa.cloud.bean.RiceponAddOrderBean
;
import
com.gingersoft.gsa.cloud.print.bean.OrderDetails
;
import
com.gingersoft.gsa.delivery_pick_mode.mvp.contract.SendOrderContract
;
import
com.gingersoft.gsa.delivery_pick_mode.mvp.model.MemberAddressInfoBean
;
import
com.jess.arms.di.scope.ActivityScope
;
...
...
@@ -19,6 +19,7 @@ import org.json.JSONArray;
import
org.json.JSONException
;
import
org.json.JSONObject
;
import
java.util.ArrayList
;
import
java.util.HashMap
;
import
java.util.List
;
import
java.util.Map
;
...
...
@@ -56,6 +57,7 @@ public class SendOrderPresenter extends BasePresenter<SendOrderContract.Model, S
ImageLoader
mImageLoader
;
@Inject
AppManager
mAppManager
;
public
List
<
OrderDetails
.
DataBean
.
PRODUCTNAMEBean
>
productnameBeans
=
new
ArrayList
<>();
@Inject
public
SendOrderPresenter
(
SendOrderContract
.
Model
model
,
SendOrderContract
.
View
rootView
)
{
...
...
@@ -144,6 +146,8 @@ public class SendOrderPresenter extends BasePresenter<SendOrderContract.Model, S
public
void
onNext
(
@NonNull
RiceponAddOrderBean
info
)
{
if
(
info
.
getCode
().
equals
(
"1"
))
{
mRootView
.
killMyself
();
}
else
if
(
TextUtil
.
isNotEmptyOrNullOrUndefined
(
info
.
getErrorMsg
())){
mRootView
.
showMessage
(
info
.
getErrorMsg
());
}
}
...
...
@@ -174,69 +178,75 @@ public class SendOrderPresenter extends BasePresenter<SendOrderContract.Model, S
//实际总价
json
.
put
(
"totalPrice"
,
MyOrderManage
.
getInstance
().
getTotalAmount
());
json
.
put
(
"waimaiSendTime"
,
waimaiSendTime
);
//送单时间
JSONArray
array
=
new
JSONArray
();
List
<
OrderDetail
>
orderDetails
=
MyOrderManage
.
getInstance
().
getOrderFoodList
();
for
(
int
i
=
0
;
i
<
orderDetails
.
size
();
i
++)
{
OrderDetail
orderDetail
=
orderDetails
.
get
(
i
);
JSONObject
food
=
getFoodJson
(
orderDetail
);
if
(
i
+
1
<
orderDetails
.
size
()
&&
orderDetails
.
get
(
i
+
1
).
getParentId
()
==
orderDetail
.
getProductId
()
&&
orderDetails
.
get
(
i
+
1
).
getItemType
()
!=
0
)
{
//如果下一個食品的父級id是當前食品的id
JSONArray
foodArray
=
new
JSONArray
();
long
foodId
=
orderDetail
.
getProductId
();
for
(
int
j
=
i
+
1
;
j
<
orderDetails
.
size
();
j
++)
{
OrderDetail
secondOrderDetail
=
orderDetails
.
get
(
j
);
JSONObject
secondFood
=
getFoodJson
(
secondOrderDetail
);
JSONArray
secondArray
=
new
JSONArray
();
if
(
orderDetails
.
get
(
j
).
getParentId
()
==
foodId
)
{
secondArray
.
put
(
secondFood
);
long
secondFoodId
=
secondOrderDetail
.
getProductId
();
if
(
j
+
1
<
orderDetails
.
size
()
&&
orderDetails
.
get
(
j
+
1
).
getParentId
()
==
secondOrderDetail
.
getProductId
())
{
for
(
int
k
=
j
+
1
;
k
<
orderDetails
.
size
();
k
++)
{
JSONObject
thirdFood
=
getFoodJson
(
secondOrderDetail
);
JSONArray
thirdArray
=
new
JSONArray
();
if
(
orderDetails
.
get
(
k
).
getParentId
()
==
secondFoodId
)
{
thirdArray
.
put
(
getFoodJson
(
orderDetails
.
get
(
k
)));
}
else
{
thirdFood
.
put
(
"itemDetail"
,
thirdArray
);
secondArray
.
put
(
thirdFood
);
i
=
k
;
break
;
}
}
JSONArray
foodArray
=
new
JSONArray
();
for
(
OrderDetails
.
DataBean
.
PRODUCTNAMEBean
productnameBean
:
productnameBeans
)
{
JSONObject
food
=
getFoodJson
(
productnameBean
);
if
(
productnameBean
.
getChild
()
!=
null
)
{
JSONArray
secondJsonArray
=
new
JSONArray
();
for
(
OrderDetails
.
DataBean
.
PRODUCTNAMEBean
.
ChildBeanX
childBeanX
:
productnameBean
.
getChild
())
{
JSONObject
secondJsonObj
=
getFoodJson
(
childBeanX
);
if
(
childBeanX
.
getChild
()
!=
null
)
{
JSONArray
thirdJsonArray
=
new
JSONArray
();
for
(
OrderDetails
.
DataBean
.
PRODUCTNAMEBean
.
ChildBeanX
.
ChildBean
childBean
:
childBeanX
.
getChild
())
{
thirdJsonArray
.
put
(
getFoodJson
(
childBean
));
}
}
else
{
secondFood
.
put
(
"itemDetail"
,
secondArray
);
foodArray
.
put
(
secondFood
);
i
=
j
;
break
;
secondJsonObj
.
put
(
"itemDetail"
,
thirdJsonArray
);
}
secondJsonArray
.
put
(
secondJsonObj
);
food
.
put
(
"itemDetail"
,
secondJsonArray
);
}
}
else
{
array
.
put
(
food
);
}
foodArray
.
put
(
food
);
}
json
.
put
(
"foods"
,
a
rray
);
json
.
put
(
"foods"
,
foodA
rray
);
}
catch
(
JSONException
e
)
{
e
.
printStackTrace
();
}
return
json
.
toString
();
}
private
JSONObject
getFoodJson
(
OrderDetail
orderDetail
)
{
private
JSONObject
getFoodJson
(
OrderDetails
.
DataBean
.
PRODUCTNAMEBean
.
ChildBeanX
.
ChildBean
childBean
)
{
JSONObject
object
=
new
JSONObject
();
try
{
object
.
put
(
"posFid"
,
childBean
.
getPid
());
object
.
put
(
"productId"
,
childBean
.
getOdsId
());
object
.
put
(
"productName"
,
childBean
.
getPRODUCT_NAME
());
object
.
put
(
"number"
,
childBean
.
getNum
());
object
.
put
(
"price"
,
childBean
.
getPRICE
());
object
.
put
(
"lunchboxPrice"
,
childBean
.
getLunchboxPrice
());
}
catch
(
JSONException
e
)
{
e
.
printStackTrace
();
}
return
object
;
}
private
JSONObject
getFoodJson
(
OrderDetails
.
DataBean
.
PRODUCTNAMEBean
.
ChildBeanX
childBean
)
{
JSONObject
object
=
new
JSONObject
();
try
{
object
.
put
(
"posFid"
,
orderDetail
.
getParentI
d
());
object
.
put
(
"productId"
,
orderDetail
.
getProduct
Id
());
object
.
put
(
"productName"
,
orderDetail
.
getProductName
());
object
.
put
(
"number"
,
orderDetail
.
getNumber
());
object
.
put
(
"price"
,
orderDetail
.
getPrice
());
object
.
put
(
"lunchboxPrice"
,
orderDetail
.
getLunchboxPrice
());
object
.
put
(
"posFid"
,
childBean
.
getPi
d
());
object
.
put
(
"productId"
,
childBean
.
getOds
Id
());
object
.
put
(
"productName"
,
childBean
.
getPRODUCT_NAME
());
object
.
put
(
"number"
,
childBean
.
getNum
());
object
.
put
(
"price"
,
childBean
.
getPRICE
());
object
.
put
(
"lunchboxPrice"
,
childBean
.
getLunchboxPrice
());
}
catch
(
JSONException
e
)
{
e
.
printStackTrace
();
}
return
object
;
}
private
JSONObject
getFoodJson
(
OrderDetails
.
DataBean
.
PRODUCTNAMEBean
productnameBean
)
{
JSONObject
object
=
new
JSONObject
();
try
{
object
.
put
(
"posFid"
,
productnameBean
.
getPid
());
object
.
put
(
"productId"
,
productnameBean
.
getOdsId
());
object
.
put
(
"productName"
,
productnameBean
.
getPRODUCT_NAME
());
object
.
put
(
"number"
,
productnameBean
.
getNum
());
object
.
put
(
"price"
,
productnameBean
.
getPRICE
());
object
.
put
(
"lunchboxPrice"
,
productnameBean
.
getLunchboxPrice
());
}
catch
(
JSONException
e
)
{
e
.
printStackTrace
();
}
return
object
;
}
}
delivery_pick_module/src/main/java/com/gingersoft/gsa/delivery_pick_mode/mvp/ui/activity/SendOrderActivity.java
View file @
7b53780d
...
...
@@ -128,13 +128,61 @@ public class SendOrderActivity extends BaseActivity<SendOrderPresenter> implemen
@Override
public
void
initData
(
@Nullable
Bundle
savedInstanceState
)
{
sendTime
=
deliveryTimes
.
get
(
0
);
List
<
OrderDetails
.
DataBean
.
PRODUCTNAMEBean
>
productnameBeans
=
new
ArrayList
<>()
;
List
<
OrderDetails
.
DataBean
.
PRODUCTNAMEBean
>
productnameBeans
=
mPresenter
.
productnameBeans
;
List
<
OrderDetail
>
orderDetails
=
MyOrderManage
.
getInstance
().
getOrderFoodList
();
for
(
OrderDetail
orderDetail
:
orderDetails
)
{
OrderDetails
.
DataBean
.
PRODUCTNAMEBean
productnameBean
=
new
OrderDetails
.
DataBean
.
PRODUCTNAMEBean
();
productnameBean
.
setPRODUCT_NAME
(
orderDetail
.
getProductName
());
productnameBean
.
setNum
(
orderDetail
.
getNumber
()
+
""
);
productnameBean
.
setPRICE
(
orderDetail
.
getPrice
()
+
""
);
for
(
int
i
=
0
;
i
<
orderDetails
.
size
();
i
++)
{
OrderDetail
orderDetail
=
orderDetails
.
get
(
i
);
long
foodId
=
orderDetail
.
getProductId
();
OrderDetails
.
DataBean
.
PRODUCTNAMEBean
productnameBean
=
orderDetailTranProductnameBean
(
orderDetail
);
if
(
i
+
1
<
orderDetails
.
size
()
&&
orderDetails
.
get
(
i
+
1
).
getItemType
()
!=
1
&&
orderDetails
.
get
(
i
+
1
).
getParentId
()
==
orderDetail
.
getProductId
())
{
List
<
OrderDetails
.
DataBean
.
PRODUCTNAMEBean
.
ChildBeanX
>
childBeanXList
=
new
ArrayList
<>();
OrderDetails
.
DataBean
.
PRODUCTNAMEBean
.
ChildBeanX
childBeanX
=
new
OrderDetails
.
DataBean
.
PRODUCTNAMEBean
.
ChildBeanX
();
//如果下一個食品的父級id是當前食品的id
for
(
int
j
=
i
+
1
;
j
<
orderDetails
.
size
();
j
++)
{
OrderDetail
secondOrderDetail
=
orderDetails
.
get
(
j
);
if
(
secondOrderDetail
.
getParentId
()
==
foodId
)
{
long
secondFoodId
=
secondOrderDetail
.
getProductId
();
//當前食品是orderDetail的子食品,遍歷後面的食品是不是當前食品的子食品(三級子食品)
if
(
j
+
1
<
orderDetails
.
size
()
&&
orderDetails
.
get
(
j
+
1
).
getItemType
()
!=
1
&&
orderDetails
.
get
(
j
+
1
).
getItemType
()
!=
2
&&
orderDetails
.
get
(
j
+
1
).
getParentId
()
==
secondFoodId
)
{
List
<
OrderDetails
.
DataBean
.
PRODUCTNAMEBean
.
ChildBeanX
.
ChildBean
>
childBeans
=
new
ArrayList
<>();
OrderDetails
.
DataBean
.
PRODUCTNAMEBean
.
ChildBeanX
.
ChildBean
childBean
=
new
OrderDetails
.
DataBean
.
PRODUCTNAMEBean
.
ChildBeanX
.
ChildBean
();
for
(
int
k
=
0
;
k
<
orderDetails
.
size
();
k
++)
{
OrderDetail
thirdOrderDetail
=
orderDetails
.
get
(
j
);
if
(
thirdOrderDetail
.
getParentId
()
==
secondFoodId
)
{
childBean
.
setPRODUCT_NAME
(
thirdOrderDetail
.
getProductName
());
childBean
.
setNum
(
thirdOrderDetail
.
getNumber
()
+
""
);
childBean
.
setOdsId
(
thirdOrderDetail
.
getProductId
()
+
""
);
childBean
.
setPid
(
thirdOrderDetail
.
getParentId
()
+
""
);
childBean
.
setPRICE
(
thirdOrderDetail
.
getPrice
()
+
""
);
childBean
.
setLunchboxPrice
(
thirdOrderDetail
.
getLunchboxPrice
());
childBeans
.
add
(
childBean
);
j
=
k
;
}
else
{
j
=
k
-
1
;
break
;
}
}
childBeanX
.
setChild
(
childBeans
);
}
else
{
childBeanX
.
setPRODUCT_NAME
(
secondOrderDetail
.
getProductName
());
childBeanX
.
setNum
(
secondOrderDetail
.
getNumber
()
+
""
);
childBeanX
.
setPRICE
(
secondOrderDetail
.
getPrice
()
+
""
);
childBeanX
.
setOdsId
(
secondOrderDetail
.
getProductId
()
+
""
);
childBeanX
.
setPid
(
secondOrderDetail
.
getParentId
()
+
""
);
childBeanX
.
setLunchboxPrice
(
secondOrderDetail
.
getLunchboxPrice
());
childBeanXList
.
add
(
childBeanX
);
i
=
j
;
}
}
else
{
i
=
j
-
1
;
break
;
}
}
productnameBean
.
setChild
(
childBeanXList
);
}
productnameBeans
.
add
(
productnameBean
);
}
FoodListAdapter
adapter
=
new
FoodListAdapter
(
mContext
,
productnameBeans
);
...
...
@@ -156,6 +204,14 @@ public class SendOrderActivity extends BaseActivity<SendOrderPresenter> implemen
rvSendOrderBills
.
setLayoutManager
(
new
LinearLayoutManager
(
mContext
));
}
private
OrderDetails
.
DataBean
.
PRODUCTNAMEBean
orderDetailTranProductnameBean
(
OrderDetail
orderDetail
)
{
OrderDetails
.
DataBean
.
PRODUCTNAMEBean
productnameBean
=
new
OrderDetails
.
DataBean
.
PRODUCTNAMEBean
();
productnameBean
.
setPRODUCT_NAME
(
orderDetail
.
getProductName
());
productnameBean
.
setNum
(
orderDetail
.
getNumber
()
+
""
);
productnameBean
.
setPRICE
(
orderDetail
.
getPrice
()
+
""
);
return
productnameBean
;
}
@Override
public
void
initIntent
()
{
...
...
delivery_pick_module/src/main/java/com/gingersoft/gsa/delivery_pick_mode/ui/activity/DeliveryOrderMainActivity.kt
View file @
7b53780d
...
...
@@ -38,6 +38,7 @@ import com.gingersoft.gsa.delivery_pick_mode.ui.adapter.SectionsPagerAdapter
import
com.gingersoft.gsa.delivery_pick_mode.ui.base.BaseActivity
import
com.gingersoft.gsa.delivery_pick_mode.util.InjectorUtil
import
com.gingersoft.gsa.delivery_pick_mode.util.getmColor
import
com.jess.arms.mvp.IPresenter
import
com.qmuiteam.qmui.alpha.QMUIAlphaImageButton
import
com.qmuiteam.qmui.alpha.QMUIAlphaTextView
import
com.qmuiteam.qmui.util.QMUIDisplayHelper
...
...
@@ -46,7 +47,7 @@ import com.qmuiteam.qmui.widget.popup.QMUIPopups
import
kotlinx.android.synthetic.main.activity_other_order.*
class
DeliveryOrderMainActivity
:
BaseActivity
()
{
class
DeliveryOrderMainActivity
:
BaseActivity
<
IPresenter
>
()
{
private
val
pageViewModel
by
lazy
{
ViewModelProvider
(
this
,
InjectorUtil
.
getWeatherModelFactory
())[
PageViewModel
::
class
.
java
]
}
private
val
instance
by
lazy
{
this
}
...
...
delivery_pick_module/src/main/java/com/gingersoft/gsa/delivery_pick_mode/ui/activity/DeliverySettingActivity.kt
View file @
7b53780d
...
...
@@ -7,9 +7,10 @@ import com.gingersoft.gsa.delivery_pick_mode.data.model.bean.DeliveryConfig
import
com.gingersoft.gsa.delivery_pick_mode.ui.base.BaseActivity
import
com.gingersoft.gsa.delivery_pick_mode.ui.fragment.DeliveryFragment
import
com.gingersoft.gsa.delivery_pick_mode.ui.fragment.UpdateDeliveryFragment
import
com.jess.arms.mvp.IPresenter
import
kotlinx.android.synthetic.main.activity_delivery.*
class
DeliverySettingActivity
:
BaseActivity
()
{
class
DeliverySettingActivity
:
BaseActivity
<
IPresenter
>
()
{
lateinit
var
deliverylist_fragment
:
DeliveryFragment
...
...
delivery_pick_module/src/main/java/com/gingersoft/gsa/delivery_pick_mode/ui/activity/HistoryOrderActivity.kt
View file @
7b53780d
...
...
@@ -15,11 +15,12 @@ import com.gingersoft.gsa.delivery_pick_mode.ui.fragment.HistoryFragment
import
com.gingersoft.gsa.delivery_pick_mode.util.InjectorUtil
import
com.gingersoft.gsa.delivery_pick_mode.util.getmColor
import
com.google.android.material.tabs.TabLayout
import
com.jess.arms.mvp.IPresenter
import
kotlinx.android.synthetic.main.activity_history_order.*
import
java.text.ParseException
import
java.util.*
class
HistoryOrderActivity
:
BaseActivity
()
{
class
HistoryOrderActivity
:
BaseActivity
<
IPresenter
>
()
{
private
lateinit
var
mViewModel
:
HistoryOrderViewModel
...
...
delivery_pick_module/src/main/java/com/gingersoft/gsa/delivery_pick_mode/ui/activity/OrderDetailsActivity.kt
View file @
7b53780d
...
...
@@ -46,12 +46,13 @@ import com.gingersoft.gsa.delivery_pick_mode.util.InjectorUtil
import
com.gingersoft.gsa.delivery_pick_mode.util.getmColor
import
com.gingersoft.gsa.delivery_pick_mode.util.showSelectDialog
import
com.gingersoft.gsa.delivery_pick_mode.util.showWaringDialog
import
com.jess.arms.mvp.IPresenter
import
com.qmuiteam.qmui.widget.QMUITopBar
import
kotlinx.android.synthetic.main.activity_order_details.*
import
java.lang.StringBuilder
import
java.util.*
class
OrderDetailsActivity
:
BaseActivity
()
{
class
OrderDetailsActivity
:
BaseActivity
<
IPresenter
>
()
{
private
lateinit
var
pageViewModel
:
PageViewModel
...
...
delivery_pick_module/src/main/java/com/gingersoft/gsa/delivery_pick_mode/ui/activity/PayActivity.kt
View file @
7b53780d
...
...
@@ -20,9 +20,10 @@ import com.gingersoft.gsa.delivery_pick_mode.ui.adapter.FoodListAdapter
import
com.gingersoft.gsa.delivery_pick_mode.ui.adapter.PayBillAdapter
import
com.gingersoft.gsa.delivery_pick_mode.ui.base.BaseActivity
import
com.gingersoft.gsa.delivery_pick_mode.util.InjectorUtil
import
com.jess.arms.mvp.IPresenter
import
kotlinx.android.synthetic.main.activity_pay.*
class
PayActivity
:
BaseActivity
()
{
class
PayActivity
:
BaseActivity
<
IPresenter
>
()
{
private
lateinit
var
pageViewModel
:
PageViewModel
...
...
delivery_pick_module/src/main/java/com/gingersoft/gsa/delivery_pick_mode/ui/base/BaseActivity.kt
View file @
7b53780d
package
com.gingersoft.gsa.delivery_pick_mode.ui.base
import
android.os.Bundle
import
androidx.appcompat.app.AppCompatActivity
import
com.gingersoft.gsa.cloud.ui.widget.dialog.LoadingDialog
import
com.jess.arms.base.BaseActivity
import
com.jess.arms.di.component.AppComponent
import
com.jess.arms.mvp.BasePresenter
import
com.jess.arms.mvp.IModel
import
com.jess.arms.mvp.IPresenter
import
com.jess.arms.mvp.IView
open
class
BaseActivity
:
AppCompatActivity
()
{
open
class
BaseActivity
<
P
:
IPresenter
>
:
BaseActivity
<
P
>
()
{
fun
showLoading
(
message
:
String
?
=
null
)
{
if
(
message
!=
null
)
...
...
@@ -12,8 +19,33 @@ open class BaseActivity : AppCompatActivity() {
LoadingDialog
.
showDialogForLoading
(
this
)
}
fun
cancelDialogForLoading
(){
fun
cancelDialogForLoading
()
{
LoadingDialog
.
cancelDialogForLoading
()
}
override
fun
setupActivityComponent
(
appComponent
:
AppComponent
)
{
}
override
fun
initView
(
savedInstanceState
:
Bundle
?):
Int
{
return
0
}
override
fun
initData
(
savedInstanceState
:
Bundle
?)
{
}
override
fun
initIntent
()
{
}
override
fun
initTopBar
()
{
}
override
fun
initLanguage
()
{
}
override
fun
initLayoutParams
()
{
}
override
fun
initLayoutVisible
()
{
}
}
\ No newline at end of file
delivery_pick_module/src/main/res/layout/other_order_activity_send_order.xml
View file @
7b53780d
...
...
@@ -23,17 +23,17 @@
android:id=
"@+id/rv_send_order_foods"
android:layout_width=
"match_parent"
android:layout_height=
"wrap_content"
android:layout_below=
"@id/send_order_top_bar"
android:paddingLeft=
"@dimen/dp_10"
android:paddingRight=
"@dimen/dp_10"
android:layout_below=
"@id/send_order_top_bar"
app:layout_constraintTop_toBottomOf=
"@id/send_order_top_bar"
/>
<View
android:id=
"@+id/view_send_order_foods_line"
android:layout_width=
"match_parent"
android:layout_height=
"@dimen/dp_5"
android:layout_marginTop=
"@dimen/dp_10"
android:layout_below=
"@id/rv_send_order_foods"
android:layout_marginTop=
"@dimen/dp_10"
android:background=
"@color/color_ccc"
/>
<androidx.recyclerview.widget.RecyclerView
...
...
@@ -50,8 +50,8 @@
android:layout_width=
"match_parent"
android:layout_height=
"wrap_content"
android:layout_above=
"@id/layout_btn"
android:layout_marginTop=
"@dimen/dp_20"
android:layout_below=
"@id/rv_send_order_bills"
android:layout_marginTop=
"@dimen/dp_20"
android:paddingLeft=
"@dimen/dp_10"
android:paddingRight=
"@dimen/dp_10"
app:layout_constraintTop_toBottomOf=
"@id/rv_send_order_bills"
>
...
...
@@ -235,7 +235,8 @@
android:paddingBottom=
"@dimen/dp_8"
android:text=
"@string/logistics_distribution"
android:textColor=
"@color/s_send_order_radio"
android:textSize=
"@dimen/dp_16"
/>
android:textSize=
"@dimen/dp_16"
android:visibility=
"gone"
/>
</RadioGroup>
<TextView
...
...
@@ -286,7 +287,8 @@
android:paddingBottom=
"@dimen/dp_8"
android:text=
"立即支付"
android:textColor=
"@color/s_send_order_radio"
android:textSize=
"@dimen/dp_16"
/>
android:textSize=
"@dimen/dp_16"
android:visibility=
"gone"
/>
</RadioGroup>
<TextView
...
...
print-module/src/main/java/com/joe/print/mvp/print/utils/BBposPrint.java
View file @
7b53780d
...
...
@@ -5,7 +5,7 @@ import android.util.Xml;
import
com.gingersoft.gsa.cloud.base.application.GsaCloudApplication
;
import
com.gingersoft.gsa.cloud.base.utils.okhttpUtils.OkHttp3Utils
;
import
com.gingersoft.gsa.cloud.bean.WiseposBean
;
import
com.gingersoft.gsa.cloud.
print.
bean.WiseposBean
;
import
com.joe.print.mvp.print.PrintListener
;
import
com.joe.print.mvp.ui.activity.PrintActivity
;
...
...
table-module/src/main/java/com/gingersoft/gsa/cloud/table/mvp/presenter/OrderContentPresenter.java
View file @
7b53780d
...
...
@@ -24,6 +24,13 @@ import com.gingersoft.gsa.cloud.base.table.bean.TableExtBean;
import
com.gingersoft.gsa.cloud.base.utils.JsonUtils
;
import
com.gingersoft.gsa.cloud.base.utils.RestaurantExpandInfoUtils
;
import
com.gingersoft.gsa.cloud.base.utils.gson.GsonUtils
;
import
com.gingersoft.gsa.cloud.constans.ExpandConstant
;
import
com.gingersoft.gsa.cloud.constans.GoldConstants
;
import
com.gingersoft.gsa.cloud.constans.PrintConstans
;
import
com.gingersoft.gsa.cloud.database.bean.Discount
;
import
com.gingersoft.gsa.cloud.database.bean.Function
;
import
com.gingersoft.gsa.cloud.function.FunctionManager
;
import
com.gingersoft.gsa.cloud.print.PrinterUtils
;
import
com.gingersoft.gsa.cloud.table.ComponentTable
;
import
com.gingersoft.gsa.cloud.table.R
;
import
com.gingersoft.gsa.cloud.table.mvp.contract.OrderContentContract
;
...
...
@@ -41,13 +48,6 @@ import com.gingersoft.gsa.cloud.table.mvp.ui.adapter.OrderTopFunctionAdapter;
import
com.gingersoft.gsa.cloud.table.mvp.ui.adapter.meal.SelectMealAdapter
;
import
com.gingersoft.gsa.cloud.table.mvp.ui.widget.DiscountDialog
;
import
com.gingersoft.gsa.cloud.table.mvp.ui.widget.SplitTableDialog
;
import
com.gingersoft.gsa.cloud.constans.ExpandConstant
;
import
com.gingersoft.gsa.cloud.constans.GoldConstants
;
import
com.gingersoft.gsa.cloud.constans.PrintConstans
;
import
com.gingersoft.gsa.cloud.database.bean.Discount
;
import
com.gingersoft.gsa.cloud.database.bean.Function
;
import
com.gingersoft.gsa.cloud.function.FunctionManager
;
import
com.gingersoft.gsa.cloud.print.PrinterUtils
;
import
com.gingersoft.gsa.cloud.ui.widget.dialog.BaseRetryDialog
;
import
com.gingersoft.gsa.cloud.ui.widget.dialog.CommonTipDialog
;
import
com.jess.arms.di.scope.ActivityScope
;
...
...
table-module/src/main/java/com/gingersoft/gsa/cloud/table/mvp/ui/adapter/meal/SelectMealAdapter.java
View file @
7b53780d
package
com
.
gingersoft
.
gsa
.
cloud
.
bean
.
mvp
.
ui
.
adapter
.
meal
;
package
com
.
gingersoft
.
gsa
.
cloud
.
table
.
mvp
.
ui
.
adapter
.
meal
;
import
android.content.Context
;
import
android.text.TextUtils
;
...
...
@@ -8,16 +8,16 @@ import android.widget.ImageView;
import
android.widget.RelativeLayout
;
import
android.widget.TextView
;
import
com.gingersoft.gsa.cloud.bean.R2
;
import
com.gingersoft.gsa.cloud.base.application.GsaCloudApplication
;
import
com.gingersoft.gsa.cloud.base.order.bean.OrderDetail
;
import
com.gingersoft.gsa.cloud.base.order.bean.mealManger.MyOrderManage
;
import
com.gingersoft.gsa.cloud.base.utils.MoneyUtil
;
import
com.gingersoft.gsa.cloud.bean.R
;
import
com.gingersoft.gsa.cloud.bean.mvp.presenter.MealStandPresenter
;
import
com.gingersoft.gsa.cloud.bean.mvp.presenter.OrderContentPresenter
;
import
com.gingersoft.gsa.cloud.bean.mvp.ui.activity.MealStandActivity
;
import
com.gingersoft.gsa.cloud.constans.MealConstant
;
import
com.gingersoft.gsa.cloud.table.R
;
import
com.gingersoft.gsa.cloud.table.R2
;
import
com.gingersoft.gsa.cloud.table.mvp.presenter.MealStandPresenter
;
import
com.gingersoft.gsa.cloud.table.mvp.presenter.OrderContentPresenter
;
import
com.gingersoft.gsa.cloud.table.mvp.ui.activity.MealStandActivity
;
import
com.jess.arms.base.BaseHolder
;
import
com.jess.arms.base.DefaultAdapter
;
import
com.jess.arms.mvp.BasePresenter
;
...
...
Write
Preview
Markdown
is supported
0%
Try again
or
attach a new file
Attach a file
Cancel
You are about to add
0
people
to the discussion. Proceed with caution.
Finish editing this message first!
Cancel
Please
register
or
sign in
to comment