套餐价格取固定商品价格，总价格加可选商品价格

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

@@ -833,16 +833,23 @@ public class ShoppingCartConvertAdapter {
             //更新当前商品行价格
             Long newOrigOriginalPrice = 0L;
             if (isSetMealProduct) {
-                newOrigOriginalPrice += cartGoods.getProductComboList().stream().mapToLong(t -> t.getOriginalAmount()).sum();
-                newOrigOriginalPrice += cartGoods.getProductGroupList().stream().mapToLong(t -> t.getOriginalAmount()).sum();
+                Long comboxGoodsOriginalPrice = cartGoods.getProductComboList().stream().mapToLong(t -> t.getOriginalAmount()).sum();
+                Long groupGoodsOriginalPrice = cartGoods.getProductGroupList().stream().mapToLong(t -> t.getOriginalAmount()).sum();
+                Long comboxGoodsFinalPrice = cartGoods.getProductComboList().stream().mapToLong(t -> t.getFinalPrice()).sum();
+                Long groupGoodsFinalPrice = cartGoods.getProductGroupList().stream().mapToLong(t -> t.getFinalPrice()).sum();
+                cartGoods.setOriginalPrice(comboxGoodsOriginalPrice);
+                cartGoods.setOriginalAmount((comboxGoodsOriginalPrice+groupGoodsOriginalPrice)* cartGoods.getQty());
+                cartGoods.setAmount((comboxGoodsFinalPrice+groupGoodsFinalPrice) * cartGoods.getQty());
+                //咨询商品服务，套餐售价取originalPrice
+                cartGoods.setFinalPrice(comboxGoodsFinalPrice);
             } else {
                 newOrigOriginalPrice = isSkuProduct ? skuProduct.getFinalPrice() : spuProduct.getFinalPrice();
+                cartGoods.setOriginalPrice(newOrigOriginalPrice);
+                cartGoods.setOriginalAmount(newOrigOriginalPrice * cartGoods.getQty());
+                cartGoods.setAmount(newOrigOriginalPrice * cartGoods.getQty());
+                //咨询商品服务，套餐售价取originalPrice
+                cartGoods.setFinalPrice(isSkuProduct ? skuProduct.getFinalPrice() : spuProduct.getFinalPrice());
             }
-            cartGoods.setOriginalPrice(newOrigOriginalPrice);
-            cartGoods.setOriginalAmount(newOrigOriginalPrice * cartGoods.getQty());
-            cartGoods.setAmount(newOrigOriginalPrice * cartGoods.getQty());
-            //咨询商品服务，套餐售价取originalPrice
-            cartGoods.setFinalPrice(isSetMealProduct ? spuProduct.getOriginalPrice() : isSkuProduct ? skuProduct.getFinalPrice() : spuProduct.getFinalPrice());
             cartGoods.setWeight(isSkuProduct ? skuProduct.getWeight() : spuProduct.getWeight());
             cartGoods.setUnit(isSkuProduct ? skuProduct.getUnit() : spuProduct.getUnit());
             cartGoods.setWeightType(CommonsConstant.WEIGHT_PRODUCT.equals(spuProduct.getWeightType()));

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

@@ -70,13 +70,15 @@ public class SetMealCalculation {
             long productComboTotalAmount = productComboAmount * cartGoods.getQty();
 
             cartGoods.setOriginalAmount(productGroupTotalAmount + productComboTotalAmount);
-            cartGoods.setOriginalPrice(productGroupTotalAmount + productComboTotalAmount);
+            cartGoods.setOriginalPrice(productComboTotalAmount);
+            cartGoods.setAmount(productGroupTotalAmount + productComboTotalAmount);
+            cartGoods.setFinalPrice(productComboTotalAmount);
 
             // 套餐（固定商品）现价
-            String toastMsg = getTotalAmount(cartGoods, productGroupAmount, numberMap, goodsMap);
-            if (StringUtils.isNotEmpty(toastMsg)) {
-                shoppingCartGoodsResponseVo.setToastMsg(toastMsg);
-            }
+//            String toastMsg = getTotalAmount(cartGoods, productGroupAmount, numberMap, goodsMap);
+//            if (StringUtils.isNotEmpty(toastMsg)) {
+//                shoppingCartGoodsResponseVo.setToastMsg(toastMsg);
+//            }
 
         }