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

@@ -565,11 +565,18 @@ 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.YES.getCode())){
-            couponPromotionVO.setAvailableCouponQueryFlag(shoppingCartInfoRequestVo.getVersion());
+//        couponPromotionVO.setAvailableCouponQueryFlag(shoppingCartInfoRequestVo.getFlag() == null ? "":shoppingCartInfoRequestVo.getFlag().toString());
+        //点餐页不查询可用优惠券
+        if(Objects.equals(shoppingCartInfoRequestVo.getFlag(), SubmitPageEnum.NO.getCode())){
+            couponPromotionVO.setAvailableCouponQueryFlag(AvailableCouponQueryFlagEnum.NO.getCode());
+        }else {
+            //老版本结算页查询可用优惠券
+            couponPromotionVO.setAvailableCouponQueryFlag(AvailableCouponQueryFlagEnum.YES.getCode());
+        }
+        //结算页购物车固定版本2不查询可用优惠券
+        if(Objects.equals(shoppingCartInfoRequestVo.getFlag(), SubmitPageEnum.YES.getCode()) && "2".equals(shoppingCartInfoRequestVo.getVersion())){
+            couponPromotionVO.setAvailableCouponQueryFlag(AvailableCouponQueryFlagEnum.NO.getCode());
         }
-
         couponPromotionVO.setUnChooseCouponCode(shoppingCartInfoRequestVo.getUnChooseCouponCode());
         // 重新校验一遍 couponcodes
         if (CollectionUtils.isNotEmpty(couponPromotionVO.getCouponCodes())) {

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

@@ -55,7 +55,7 @@ public class CouponPromotionService implements IPromotionService {
                                                 ShoppingCartGoodsResponseVo shoppingCartGoodsResponseVo, UserLoginInfoDto userLoginInfoDto,
                                                 ShoppingCartInfoRequestVo shoppingCartInfoRequestVo) {
         // 用户选择了查询优惠券信息
-        if (couponPromotionVO != null && !ObjectUtils.equals(AvailableCouponQueryFlagEnum.NO.getCode(), couponPromotionVO.getAvailableCouponQueryFlag())) {
+        if (couponPromotionVO != null && ObjectUtils.equals(AvailableCouponQueryFlagEnum.YES.getCode(), couponPromotionVO.getAvailableCouponQueryFlag())) {
             List<CartGoods> tmpCartGoods = cartGoodsList.parallelStream().filter(k -> (k.getCartGoodsUid()
                     .startsWith(CommonsConstant.COUPON_PREFIX) || StringUtils.isNotBlank(k.getCouponCode()))).collect(Collectors.toList());
             // 是否存在商品券