行记录：套餐用促销的价格+可选搭配

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

@@ -398,8 +398,7 @@ public class CalculationCommonService {
             List<ShoppingCartGoodsDto.CartGoodsDetailDto> comboLists = this.com2DetailGoods(gxDiscount, cartGoods.getProductComboList(), cartGoods, true);
             combs.addAll(comboLists);
             cartGoodsDetailDto.setProductType(ProductType.SETMEAL.getCode());
-            //originalPriceSum = comboLists.stream().mapToLong(ShoppingCartGoodsDto.CartGoodsDetailDto::getOriginalPrice).sum();
-            //cartGoodsDetailDto.setOriginalPrice(originalPriceSum);
+            cartGoodsDetailDto.setOriginalPrice(calculationGoods.getOriginalPrice());
         }
         /**
          * 可选商品
@@ -414,9 +413,9 @@ public class CalculationCommonService {
             originalPriceSum = 0L;
             for (ShoppingCartGoodsDto.CartGoodsDetailDto goodsDetailDto : groupList) {
                 //originalPriceSum += goodsDetailDto.getOriginalPrice() * (goodsDetailDto.getQty() / cartGoods.getQty());
-                //originalPriceSum += goodsDetailDto.getOriginalPrice() * cartGoods.getQty();
+                originalPriceSum += goodsDetailDto.getOriginalPrice() * goodsDetailDto.getQty();
             }
-            //cartGoodsDetailDto.setOriginalPrice(cartGoodsDetailDto.getOriginalPrice()+originalPriceSum);
+            cartGoodsDetailDto.setOriginalPrice(cartGoodsDetailDto.getOriginalPrice() + originalPriceSum);
         }
         cartGoodsDetailDto.setComboProducts(combs);
         List<ShoppingCartGoodsDto.CartGoodsDetailDto.CartGoodsExtra> cartGoodsExtras = BeanUtil.convertBeans(cartGoods.getExtra(), ShoppingCartGoodsDto.CartGoodsDetailDto.CartGoodsExtra::new);