套餐价为子商品最终价总和

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

@@ -55,12 +55,18 @@ public class SetMealCalculation {
 
         // 设置商品原价与商品现价的初始值
         for (CartGoods cartGoods : setMealProducts) {
-            cartGoods.setOriginalAmount(cartGoods.getOriginalPrice() * cartGoods.getQty());
+//            cartGoods.setOriginalAmount(cartGoods.getOriginalPrice() * cartGoods.getQty());
             cartGoods.setPackPrice(cartGoods.getPackPrice() * cartGoods.getQty());
             // 可选商品现总价
             long productGroupAmount = cartGoods.getProductGroupList().stream().mapToLong(t -> t.getFinalPrice() * t.getQty()).sum();
             productGroupTotalAmount += productGroupAmount * cartGoods.getQty();
 
+            // 固定商品现总价
+            long productComboAmount = cartGoods.getProductComboList().stream().mapToLong(t -> t.getFinalPrice() * t.getQty()).sum();
+            long productComboTotalAmount = productComboAmount * cartGoods.getQty();
+
+            cartGoods.setOriginalAmount(productGroupTotalAmount + productComboTotalAmount);
+
             // 套餐（固定商品）现价
             String toastMsg = getTotalAmount(cartGoods, productGroupAmount, numberMap, goodsMap);
             if (StringUtils.isNotEmpty(toastMsg)) {