Merge remote-tracking branch 'remotes/origin/feature/促销算价基于最新master的分支'

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

@@ -398,7 +398,10 @@ public class CalculationCommonService {
             List<ShoppingCartGoodsDto.CartGoodsDetailDto> comboLists = this.com2DetailGoods(gxDiscount, cartGoods.getProductComboList(), cartGoods, true);
             combs.addAll(comboLists);
             cartGoodsDetailDto.setProductType(ProductType.SETMEAL.getCode());
-            cartGoodsDetailDto.setOriginalPrice(calculationGoods.getOriginalPrice());
+            for (ShoppingCartGoodsDto.CartGoodsDetailDto comboList : comboLists) {
+                originalPriceSum += comboList.getQty() * comboList.getOriginalPrice();
+            }
+            cartGoodsDetailDto.setOriginalPrice(originalPriceSum);
         }
         /**
          * 可选商品