From 8c42c34df6d551966302f5e86895550b046ab572 Mon Sep 17 00:00:00 2001 From: w-R <953969641@qq.com> Date: Sat, 7 May 2022 18:47:33 +0800 Subject: [PATCH] =?UTF-8?q?=E8=AE=A2=E5=8D=95=E7=BB=93=E7=AE=97=E4=BF=A1?= =?UTF-8?q?=E6=81=AF=E6=8E=A5=E5=8F=A3=E6=9B=B4=E6=94=B9,+=E4=BC=A0?= =?UTF-8?q?=E6=94=AF=E4=BB=98=E6=96=B9=E5=BC=8F?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- lib/settlement/settlement.dart | 31 +++++++++++++++++++++++-------- 1 file changed, 23 insertions(+), 8 deletions(-) diff --git a/lib/settlement/settlement.dart b/lib/settlement/settlement.dart index a7a777da..7b27e760 100644 --- a/lib/settlement/settlement.dart +++ b/lib/settlement/settlement.dart @@ -96,6 +96,7 @@ class _Settlement extends State { null, 0, widget.arguments["pid"], + payChannel ); } else if (coupons != null && coupons != "" || tableId <= 0) { queryOrderInfo( @@ -104,9 +105,10 @@ class _Settlement extends State { 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 { memberCouponId, orderId, promotionId, + payChannel, ) async { BaseData 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 { this.selectedBtn = selectedBtn; }); if (address != null) { - queryOrderInfo(address.id, selectedBtn, null, 0, null); + queryOrderInfo(address.id, selectedBtn, null, 0, null,payChannel); return; } BaseData> baseDate = @@ -206,7 +211,7 @@ class _Settlement extends State { } } - queryOrderInfo(address.id, selectedBtn, null, 0, null); + queryOrderInfo(address.id, selectedBtn, null, 0, null,payChannel); } } @@ -222,7 +227,7 @@ class _Settlement extends State { }); }); - queryOrderInfo(address.id, selectedBtn, null, 0, null); + queryOrderInfo(address.id, selectedBtn, null, 0, null,payChannel); } } @@ -438,7 +443,7 @@ class _Settlement extends State { 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 { 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 { selectedBtn, couponListBean?.id, 0, - promotion?.id, + null, + payChannel ); // } } @@ -619,9 +633,10 @@ class _Settlement extends State { queryOrderInfo( address?.id, selectedBtn, - couponListBean?.id, + null, 0, promotion?.id, + payChannel ); // } }