Merge branch 'feature/20201112_套餐价格计算_yu.sun' into qa

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

@@ -510,8 +510,6 @@ public class ShoppingCartConvertAdapter {
             // 应产品要求
             // 普通商品，取商品的finalePrice(普通商品售价);套餐商品，取originalPrice(套餐价格)
             if (ObjectUtils.equals(com.freemud.sdk.api.assortment.shoppingcart.constant.GoodsTypeEnum.SET_MEAL_GOODS.getGoodsType(), cartGoods.getGoodsType())){
-                int price = (null == cartGoods.getProductGroupList() ? 0 : cartGoods.getProductGroupList().stream().mapToInt(t->(null == t.getOriginalPrice() ? 0 : t.getOriginalPrice().intValue()) *t.getQty()).sum()) +
-                        cartGoods.getOriginalPrice().intValue();
                 productType.setPrice(null == cartGoods.getOriginalPrice() ? 0 : cartGoods.getOriginalPrice().intValue());
             }else{
                 productType.setPrice(cartGoods.getFinalPrice() == null ? 0 : cartGoods.getFinalPrice().intValue());

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

@@ -1370,8 +1370,7 @@ public class ShoppingCartMCoffeeServiceImpl {
 
         //超值加购商品赋值
         if (ObjectUtils.equals(GoodsTypeEnum.REDUCE_PRICE_GOODS.getGoodsType(), cartGoods.getGoodsType())
-                || ObjectUtils.equals(GoodsTypeEnum.COUPON_GOODS.getGoodsType(), cartGoods.getGoodsType())
-                || ObjectUtils.equals(GoodsTypeEnum.SET_MEAL_GOODS.getGoodsType(), cartGoods.getGoodsType())) {
+                || ObjectUtils.equals(GoodsTypeEnum.COUPON_GOODS.getGoodsType(), cartGoods.getGoodsType())) {
             cartGoods.setOriginalPrice(productBeanListSpuClass.get(0).getOriginalPrice());
             cartGoods.setFinalPrice(productBeanListSpuClass.get(0).getFinalPrice());
             cartGoods.setPackPrice(productBeanListSpuClass.get(0).getPackPrice());
@@ -1385,6 +1384,36 @@ public class ShoppingCartMCoffeeServiceImpl {
             cartGoods.setTaxId(productBeanListSpuClass.get(0).getTaxId());
         }
 
+        //套餐商品赋值
+        if (ObjectUtils.equals(GoodsTypeEnum.SET_MEAL_GOODS.getGoodsType(), cartGoods.getGoodsType())){
+            cartGoods.setOriginalPrice(productBeanListSpuClass.get(0).getOriginalPrice());
+            cartGoods.setFinalPrice(productBeanListSpuClass.get(0).getFinalPrice());
+            cartGoods.setPackPrice(productBeanListSpuClass.get(0).getPackPrice());
+            cartGoods.setCustomerCode(productBeanListSpuClass.get(0).getCustomerCode());
+            cartGoods.setName(productBeanListSpuClass.get(0).getName());
+            cartGoods.setSpuName(productBeanListSpuClass.get(0).getName());
+            cartGoods.setSkuName(productBeanListSpuClass.get(0).getName());
+            cartGoods.setPic(productBeanListSpuClass.get(0).getPicture());
+            cartGoods.setStockLimit(productBeanListSpuClass.get(0).getStockLimit() == 1);
+            cartGoods.setTax(productBeanListSpuClass.get(0).getTax());
+            cartGoods.setTaxId(productBeanListSpuClass.get(0).getTaxId());
+
+            //套餐可选商品赋值
+            if (CollectionUtils.isNotEmpty(productBeanListSpuClass.get(0).getProductGroupList())){
+                for (ProductBeanDTO.ProductGroupType groupType : productBeanListSpuClass.get(0).getProductGroupList()) {
+                    if (CollectionUtils.isNotEmpty(groupType.getGroupDetail())){
+                        for (ProductBeanDTO.ProductGroupType.GroupDetailType detailType : groupType.getGroupDetail()) {
+                            for (CartGoods.ComboxGoods groupGoods : cartGoods.getProductGroupList()) {
+                                if (detailType.getProductId().equals(groupGoods.getGoodsId())) {
+                                    groupGoods.setFinalPrice(detailType.getMarkUpPrice().longValue());
+                                    groupGoods.setOriginalPrice(detailType.getProductPrice().longValue());
+                                }
+                            }
+                        }
+                    }
+                }
+            }
+        }
     }