更换标识字段

order-application-service/src/main/java/cn/freemud/entities/vo/ShoppingCartInfoRequestVo.java

@@ -57,6 +57,11 @@ public class ShoppingCartInfoRequestVo {
      */
     private Integer flag;
     /**
+     *  1 为结算页用券
+     */
+    private Integer useCouponFlag;
+
+    /**
      * 优惠券code
      */
     private String couponCode;

order-application-service/src/main/java/cn/freemud/service/impl/CheckOrder.java

@@ -657,7 +657,8 @@ public class CheckOrder {
                 .useCustomerScore(createOrderVo.getUseCustomerScore())
                 .buyMemberCard(buyMemberCard)
                 .menuType(createOrderVo.getMenuType())
-                .flag(1) //结算页
+                .useCouponFlag(1)//结算页
+                //.flag(1)
                 // 预定单类型传递 购物车中进行查询
                 .bizType(createOrderVo.getBizType())
                 .build();

shopping-cart-application-service/src/main/java/cn/freemud/entities/vo/ShoppingCartInfoRequestVo.java

@@ -56,7 +56,9 @@ public class ShoppingCartInfoRequestVo extends BaseRequestVo {
      *  1：结算页 0：点餐页
      * 结算页会查询用户优惠券，点餐页不会查询用户优惠券
      */
-    private Integer flag = 1;
+    private Integer flag;
+     //1：结算页
+    private Integer useCouponFlag;
     /**
      * 优惠券code
      */

shopping-cart-application-service/src/main/java/cn/freemud/service/impl/ShoppingCartNewServiceImpl.java

@@ -1053,7 +1053,7 @@ public class ShoppingCartNewServiceImpl implements ShoppingCartNewService {
         String activityCode = shoppingCartInfoRequestVo.getActivityCode();
         List<ChooseCouponVo> couponCodes = shoppingCartInfoRequestVo.getCouponCodes();
         Integer bizType = shoppingCartInfoRequestVo.getBizType();
-        Integer accountFlag = shoppingCartInfoRequestVo.getFlag();
+        Integer accountFlag = shoppingCartInfoRequestVo.getUseCouponFlag();
 
         if (Objects.isNull(couponCode) && CollectionUtils.isNotEmpty(couponCodes)) {
             // fisherman 这里可能会有问题 如果只有配送券的情况下 这里 过滤掉了 得检查后面的逻辑 是否用了list去做事情