Merge branch 'feature/20201222_combo券需求_yu.sun' into qa

# Conflicts:
#	shopping-cart-application-service/src/main/java/cn/freemud/service/impl/mcoffee/calculation/CalculationServiceImpl.java

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

@@ -118,6 +118,19 @@ public class ShoppingCartMccafeAdapter {
         return cartGoodsDetailDtos;
     }
 
+    /**
+     * @param cartGoods
+     * @return
+     */
+    public List<ShoppingCartGoodsDto.CartGoodsDetailDto> convertCartGoods2DetailGoodsList(CartGoods cartGoods, List<ActivityCalculationDiscountResponseDto.CalculationDiscountResult.ApportionGoods> apportionGoodsList, Map<String, String> duplicateGoodsMap) {
+        List<ShoppingCartGoodsDto.CartGoodsDetailDto> cartGoodsDetailDtos = new ArrayList<>();
+        if (StringUtils.isEmpty(cartGoods.getCouponCode()) && GoodsTypeEnum.SET_MEAL_GOODS.getGoodsType().equals(cartGoods.getGoodsType())) {
+            return cartGoodsDetailDtos;
+        } else {
+            cartGoodsDetailDtos.add(convertCartGoods2DetailGoods(cartGoods, apportionGoodsList, duplicateGoodsMap));
+        }
+        return cartGoodsDetailDtos;
+    }
 
     /**
      * @param cartGoods

shopping-cart-application-service/src/main/java/cn/freemud/service/impl/mcoffee/calculation/CalculationServiceImpl.java

@@ -2,6 +2,7 @@ package cn.freemud.service.impl.mcoffee.calculation;
 
 import cn.freemud.adapter.ActivityAdapter;
 import cn.freemud.adapter.ShoppingCartConvertAdapter;
+import cn.freemud.adapter.ShoppingCartMccafeAdapter;
 import cn.freemud.base.entity.BaseResponse;
 import cn.freemud.constant.ResponseCodeConstant;
 import cn.freemud.entities.dto.*;
@@ -70,7 +71,6 @@ public class CalculationServiceImpl {
     @Autowired
     private ActivityAdapter activityAdapter;
 
-
     @Autowired
     private TimeSaleCalculation timeSaleCalculation;
     @Autowired
@@ -83,6 +83,8 @@ public class CalculationServiceImpl {
     @Autowired
     private MaterialCalculation materialCalculation;
     @Autowired
+    private ShoppingCartMccafeAdapter shoppingCartMccafeAdapter;
+    @Autowired
     private ShoppingCartConvertAdapter shoppingCartConvertAdapter;
     @Autowired
     private ItemServiceImpl itemService;
@@ -208,7 +210,8 @@ public class CalculationServiceImpl {
         });
         for (int i = 0, len = cartGoodsList.size(); i < len; i++) {
             CartGoods cartGoods = cartGoodsList.get(i);
-            List<ShoppingCartGoodsDto.CartGoodsDetailDto> cartGoodsDetailDtos = shoppingCartConvertAdapter.convertCartGoods2DetailGoodsList(cartGoods, apportionGoodsList,duplicateGoodsMap);
+//            List<ShoppingCartGoodsDto.CartGoodsDetailDto> cartGoodsDetailDtos = shoppingCartConvertAdapter.convertCartGoods2DetailGoodsList(cartGoods, apportionGoodsList,duplicateGoodsMap);
+            List<ShoppingCartGoodsDto.CartGoodsDetailDto> cartGoodsDetailDtos = shoppingCartMccafeAdapter.convertCartGoods2DetailGoodsList(cartGoods, apportionGoodsList,duplicateGoodsMap);
             cartGoodsDetailDtoList.addAll(cartGoodsDetailDtos);
         }
         List<ActivityCalculationDiscountResponseDto.CalculationDiscountResult.Discount> discounts = calculationDiscountResult == null ? new ArrayList<>() : calculationDiscountResult.getDiscounts();