Merge branches 'feature/20210806_日志问题修复_wuping' and 'master' of…

Merge branches 'feature/20210806_日志问题修复_wuping' and 'master' of http://gitlab.freemud.com/order-group-application/order-group

shopping-cart-application-service/src/main/java/cn/freemud/adapter/CouponAdapter.java

@@ -566,12 +566,12 @@ public class CouponAdapter {
         couponPromotionVO.setOrderType(shoppingCartInfoRequestVo.getOrderType());
 //        couponPromotionVO.setFlg(shoppingCartInfoRequestVo.getFlag());
 //        couponPromotionVO.setAvailableCouponQueryFlag(shoppingCartInfoRequestVo.getFlag() == null ? "":shoppingCartInfoRequestVo.getFlag().toString());
-        //点餐页不查询可用优惠券
-        if(Objects.equals(shoppingCartInfoRequestVo.getFlag(), SubmitPageEnum.NO.getCode())){
-            couponPromotionVO.setAvailableCouponQueryFlag(AvailableCouponQueryFlagEnum.NO.getCode());
-        }else {
-            //老版本结算页查询可用优惠券
+        //老版本结算页查询可用优惠券
+        if(Objects.equals(shoppingCartInfoRequestVo.getFlag(), SubmitPageEnum.YES.getCode())){
             couponPromotionVO.setAvailableCouponQueryFlag(AvailableCouponQueryFlagEnum.YES.getCode());
+        }else {
+            //点餐页不查询可用优惠券
+            couponPromotionVO.setAvailableCouponQueryFlag(AvailableCouponQueryFlagEnum.NO.getCode());
         }
         //结算页购物车固定版本2不查询可用优惠券
         if(Objects.equals(shoppingCartInfoRequestVo.getFlag(), SubmitPageEnum.YES.getCode()) && "2".equals(shoppingCartInfoRequestVo.getVersion())){