Merge remote-tracking branch 'origin/qa' into qa

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;
     }
@@ -171,23 +175,6 @@ public class ShoppingCartMccafeAdapter {
             cartGoodsDetailDto.setProductType(ProductType.WEIGHT_PRODUCT.getCode());
         }
 
-        //如果是套餐商品，将套餐固定子商品转换给均摊实体
-        if (CollectionUtils.isNotEmpty(cartGoods.getProductComboList())){
-            List<ShoppingCartGoodsDto.CartGoodsDetailDto> comboProductList = new ArrayList<>();
-            for (CartGoods.ComboxGoods comboGoods : cartGoods.getProductComboList()) {
-                comboProductList.add(convertComboProduct2DetailGoods(comboGoods));
-            }
-            cartGoodsDetailDto.setComboProducts(comboProductList);
-        }
-        //如果是套餐商品，将套餐固定可选商品转换给均摊实体
-        if (CollectionUtils.isNotEmpty(cartGoods.getProductGroupList())){
-            List<ShoppingCartGoodsDto.CartGoodsDetailDto> comboProductList = new ArrayList<>();
-            for (CartGoods.ComboxGoods comboGoods : cartGoods.getProductComboList()) {
-                comboProductList.add(convertComboProduct2DetailGoods(comboGoods));
-            }
-            cartGoodsDetailDto.setComboProducts(comboProductList);
-        }
-
         //小料
         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/SetMealCalculation.java

@@ -140,7 +140,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:  当前商品行套餐商品总优惠= 套餐原总价-套餐现总价-套餐可选商品的现总价