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

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

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

@@ -127,7 +127,11 @@ public class ShoppingCartMccafeAdapter {
         if (StringUtils.isEmpty(cartGoods.getCouponCode()) && GoodsTypeEnum.SET_MEAL_GOODS.getGoodsType().equals(cartGoods.getGoodsType())) {
             return cartGoodsDetailDtos;
         } else {
-            cartGoodsDetailDtos.add(convertCartGoods2DetailGoods(cartGoods, apportionGoodsList, duplicateGoodsMap));
+            ShoppingCartGoodsDto.CartGoodsDetailDto cartGoodsDetailDto = convertCartGoods2DetailGoods(cartGoods, apportionGoodsList, duplicateGoodsMap);
+            if(GoodsTypeEnum.SET_MEAL_GOODS.getGoodsType().equals(cartGoods.getGoodsType())) {
+                cartGoodsDetailDto.setComboProducts(this.convertComboxGoods2DetailGoods(cartGoods,cartGoodsDetailDto.getTotalDiscountAmount()));
+            }
+            cartGoodsDetailDtos.add(cartGoodsDetailDto);
         }
         return cartGoodsDetailDtos;
     }
@@ -170,6 +174,7 @@ public class ShoppingCartMccafeAdapter {
         } else if (cartGoods.isWeightType()) {
             cartGoodsDetailDto.setProductType(ProductType.WEIGHT_PRODUCT.getCode());
         }
+
         //小料
         if (CollectionUtils.isNotEmpty(cartGoods.getProductMaterialList())) {
             List<ShoppingCartGoodsDto.CartGoodsDetailDto.MaterialGoods> materialList = new ArrayList<>(0);

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

@@ -80,8 +80,12 @@ public class CalculationServiceImpl {
     @Autowired
     private MaterialCalculation materialCalculation;
 
+//    @Autowired
+//    private ShoppingCartConvertAdapter shoppingCartConvertAdapter;
     @Autowired
     private ShoppingCartMccafeAdapter shoppingCartMccafeAdapter;
+//    @Autowired
+//    private ItemServiceImpl itemService;
 
     /**
      * 更新购物车行优惠信息

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

@@ -110,12 +110,17 @@ public class SetMealCalculation {
 
             Long amount = null != cartGoods.getFinalPrice() ? cartGoods.getFinalPrice()*cartGoods.getQty() + productGroupTotalAmount + materialPrice :
                     productGroupTotalAmount + productComboTotalAmount + materialPrice;
+            //如果是商品券商品，不重新计算套餐价格
+            if (StringUtils.isEmpty(cartGoods.getCouponCode())) {
+                Long amount = null != cartGoods.getFinalPrice() ? cartGoods.getFinalPrice() * cartGoods.getQty() + productGroupTotalAmount + materialPrice :
+                        productGroupTotalAmount + productComboTotalAmount + materialPrice;
+                cartGoods.setAmount(amount);
+            }
             Long comboOriginalPriceAmount = null != cartGoods.getOriginalAmount() ? cartGoods.getOriginalAmount() :
                     productComboTotalAmount;
             cartGoods.setOriginalAmount(productGroupTotalAmount + comboOriginalPriceAmount + materialPrice);
             cartGoods.setOriginalPrice(null != cartGoods.getOriginalPrice() ? cartGoods.getOriginalPrice() :
                     productComboTotalAmount);
-            cartGoods.setAmount(amount);
             cartGoods.setFinalPrice(null != cartGoods.getFinalPrice() ? cartGoods.getFinalPrice() :
                     productComboTotalAmount);
 
@@ -153,7 +158,7 @@ public class SetMealCalculation {
         });
         // 套餐优惠明细
         for (CartGoods cartGoods : shoppingCartGoodsResponseVo.getProducts()) {
-            if (ObjectUtils.equals(GoodsTypeEnum.SET_MEAL_GOODS.getGoodsType(), cartGoods.getGoodsType())) {
+            if (ObjectUtils.equals(GoodsTypeEnum.SET_MEAL_GOODS.getGoodsType(), cartGoods.getGoodsType()) && StringUtils.isBlank(cartGoods.getCouponCode())) {
                 // discountAmount=(套餐原价-套餐售价)*数量
                 // productGroupDiscountAmount=可选商品现价总和
                 // discountAmount-productGroupDiscountAmount:  当前商品行套餐商品总优惠= 套餐原总价-套餐现总价-套餐可选商品的现总价