|
|
|
@ -96,6 +96,7 @@ class _Settlement extends State<Settlement> {
|
|
|
|
|
null, |
|
|
|
|
0, |
|
|
|
|
widget.arguments["pid"], |
|
|
|
|
payChannel |
|
|
|
|
); |
|
|
|
|
} else if (coupons != null && coupons != "" || tableId <= 0) { |
|
|
|
|
queryOrderInfo( |
|
|
|
@ -104,9 +105,10 @@ class _Settlement extends State<Settlement> {
|
|
|
|
|
widget.arguments["cid"], |
|
|
|
|
0, |
|
|
|
|
null, |
|
|
|
|
payChannel |
|
|
|
|
); |
|
|
|
|
} else |
|
|
|
|
queryOrderInfo(null, selectedBtn, null, 0, null); |
|
|
|
|
queryOrderInfo(null, selectedBtn, null, 0, null,payChannel); |
|
|
|
|
}); |
|
|
|
|
|
|
|
|
|
weChatResponseEventHandler.listen((event) async { |
|
|
|
@ -122,13 +124,16 @@ class _Settlement extends State<Settlement> {
|
|
|
|
|
memberCouponId, |
|
|
|
|
orderId, |
|
|
|
|
promotionId, |
|
|
|
|
payChannel, |
|
|
|
|
) async { |
|
|
|
|
BaseData<SettleOrderInfo> baseData = await minService.getOrderInfo({ |
|
|
|
|
"addressId": addressId, |
|
|
|
|
"isTake": isTake, |
|
|
|
|
"memberCouponId": memberCouponId, |
|
|
|
|
"orderId": orderId, |
|
|
|
|
"promotionId": promotionId |
|
|
|
|
"promotionId": promotionId, |
|
|
|
|
"payChannel": payChannel |
|
|
|
|
|
|
|
|
|
}).catchError((error) {}); |
|
|
|
|
if (baseData != null && baseData.isSuccess) { |
|
|
|
|
setState(() { |
|
|
|
@ -162,7 +167,7 @@ class _Settlement extends State<Settlement> {
|
|
|
|
|
this.selectedBtn = selectedBtn; |
|
|
|
|
}); |
|
|
|
|
if (address != null) { |
|
|
|
|
queryOrderInfo(address.id, selectedBtn, null, 0, null); |
|
|
|
|
queryOrderInfo(address.id, selectedBtn, null, 0, null,payChannel); |
|
|
|
|
return; |
|
|
|
|
} |
|
|
|
|
BaseData<List<Address>> baseDate = |
|
|
|
@ -206,7 +211,7 @@ class _Settlement extends State<Settlement> {
|
|
|
|
|
} |
|
|
|
|
} |
|
|
|
|
|
|
|
|
|
queryOrderInfo(address.id, selectedBtn, null, 0, null); |
|
|
|
|
queryOrderInfo(address.id, selectedBtn, null, 0, null,payChannel); |
|
|
|
|
} |
|
|
|
|
} |
|
|
|
|
|
|
|
|
@ -222,7 +227,7 @@ class _Settlement extends State<Settlement> {
|
|
|
|
|
}); |
|
|
|
|
}); |
|
|
|
|
|
|
|
|
|
queryOrderInfo(address.id, selectedBtn, null, 0, null); |
|
|
|
|
queryOrderInfo(address.id, selectedBtn, null, 0, null,payChannel); |
|
|
|
|
} |
|
|
|
|
} |
|
|
|
|
|
|
|
|
@ -438,7 +443,7 @@ class _Settlement extends State<Settlement> {
|
|
|
|
|
this.selectedBtn = 0; |
|
|
|
|
}); |
|
|
|
|
queryOrderInfo(addressId, isTake, |
|
|
|
|
memberCouponId, orderId, promotionId); |
|
|
|
|
memberCouponId, orderId, promotionId,payChannel); |
|
|
|
|
}, queryAddress, storeInfo, address, |
|
|
|
|
selectedAddress), |
|
|
|
|
|
|
|
|
@ -556,6 +561,14 @@ class _Settlement extends State<Settlement> {
|
|
|
|
|
|
|
|
|
|
payChannelCheck(int payChannel) { |
|
|
|
|
this.payChannel = payChannel; |
|
|
|
|
queryOrderInfo( |
|
|
|
|
address?.id, |
|
|
|
|
selectedBtn, |
|
|
|
|
couponListBean?.id, |
|
|
|
|
0, |
|
|
|
|
promotion?.id, |
|
|
|
|
payChannel |
|
|
|
|
); |
|
|
|
|
} |
|
|
|
|
|
|
|
|
|
mobileChange(String mobile) { |
|
|
|
@ -597,7 +610,8 @@ class _Settlement extends State<Settlement> {
|
|
|
|
|
selectedBtn, |
|
|
|
|
couponListBean?.id, |
|
|
|
|
0, |
|
|
|
|
promotion?.id, |
|
|
|
|
null, |
|
|
|
|
payChannel |
|
|
|
|
); |
|
|
|
|
// } |
|
|
|
|
} |
|
|
|
@ -619,9 +633,10 @@ class _Settlement extends State<Settlement> {
|
|
|
|
|
queryOrderInfo( |
|
|
|
|
address?.id, |
|
|
|
|
selectedBtn, |
|
|
|
|
couponListBean?.id, |
|
|
|
|
null, |
|
|
|
|
0, |
|
|
|
|
promotion?.id, |
|
|
|
|
payChannel |
|
|
|
|
); |
|
|
|
|
// } |
|
|
|
|
} |
|
|
|
|