Merge remote-tracking branch 'origin/wr_2023_activity' into wr_2023_activity

lib/settlement/settlement.dart

@@ -161,7 +161,7 @@ class _Settlement extends State<Settlement> {
             count1,
             payChannel,
             tableId);
-      } else if (coupons != null && coupons != "" && tableId <= 0) {
+      } else if ( widget.arguments["cid"] != null &&  widget.arguments["cid"] != "" && tableId <= 0) {
         queryOrderInfo(
             address != null ? address.id : null,
             ((storeInfo?.pickupType?.dineInTakeStatus ?? false) == true &&
@@ -170,13 +170,13 @@ class _Settlement extends State<Settlement> {
                     selectedBtn != 2)
                 ? diningStatus
                 : selectedBtn,
-            widget.arguments["cid"],
+            widget.arguments["cid"]??0,
             0,
             productId ?? 0,
             productSkuId ?? "",
             actProductId ?? "",
             actProductSkuId ?? "",
-            "COUPON",
+            "AUTO",
             // useVipPriceSelect,
             // useBenefitSelect,
             count1,