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

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

@@ -91,7 +91,7 @@ public class ShoppingCartConvertAdapter {
         cartGoodsDetailDto.setSkuId(StringUtils.isEmpty(cartGoods.getSkuId()) ? cartGoods.getSpuId() : cartGoods.getSkuId());
         cartGoodsDetailDto.setSkuName(StringUtils.isEmpty(cartGoods.getSkuName()) ? cartGoods.getSpuName() : cartGoods.getSkuName());
         cartGoodsDetailDto.setOriginalPrice(cartGoods.getOriginalPrice());
-        cartGoodsDetailDto.setTotalDiscountAmount(0);
+//        cartGoodsDetailDto.setTotalDiscountAmount(0);
         cartGoodsDetailDto.setSalePrice(cartGoods.getOriginalPrice());
         cartGoodsDetailDto.setPicture(cartGoods.getPic());
         cartGoodsDetailDto.setQty(cartGoods.getQty());

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

@@ -54,7 +54,10 @@ public class SetMealCalculation {
                 .collect(Collectors.toMap(ActivityCalculationDiscountResponseDto.CalculationDiscountResult.Goods::getGoodsId, Function.identity(), (k1, k2) -> k1));
 
         // 设置商品原价与商品现价的初始值
-        for (CartGoods cartGoods : setMealProducts) {
+        for (CartGoods cartGoods : cartGoodsList) {
+            if(!ObjectUtils.equals(GoodsTypeEnum.SET_MEAL_GOODS.getGoodsType(), cartGoods.getGoodsType())){
+                continue;
+            }
 //            cartGoods.setOriginalAmount(cartGoods.getOriginalPrice() * cartGoods.getQty());
             cartGoods.setPackPrice(cartGoods.getPackPrice() * cartGoods.getQty());
             // 可选商品现总价
@@ -66,6 +69,7 @@ public class SetMealCalculation {
             long productComboTotalAmount = productComboAmount * cartGoods.getQty();
 
             cartGoods.setOriginalAmount(productGroupTotalAmount + productComboTotalAmount);
+            cartGoods.setOriginalPrice(productGroupTotalAmount + productComboTotalAmount);
 
             // 套餐（固定商品）现价
             String toastMsg = getTotalAmount(cartGoods, productGroupAmount, numberMap, goodsMap);
@@ -75,13 +79,13 @@ public class SetMealCalculation {
 
         }
 
-        long totalFinalPrice = setMealProducts.stream().mapToLong(product -> product.getFinalPrice() * product.getQty()).sum();
-        long totalOriginalPrice = setMealProducts.stream().mapToLong(product -> product.getOriginalPrice() * product.getQty()).sum();
+//        long totalFinalPrice = setMealProducts.stream().mapToLong(product -> product.getFinalPrice() * product.getQty()).sum();
+//        long totalOriginalPrice = setMealProducts.stream().mapToLong(product -> product.getOriginalPrice() * product.getQty()).sum();
 
         //总原价=促销优惠 - 套餐finalPrice + 套餐原价
 //        shoppingCartGoodsResponseVo.setOriginalTotalAmount(shoppingCartGoodsResponseVo.getOriginalTotalAmount() - totalFinalPrice + totalOriginalPrice);
         //总现价=促销现总价 + 可选商品现总价
-//        shoppingCartGoodsResponseVo.setTotalAmount(shoppingCartGoodsResponseVo.getTotalAmount() + productGroupTotalAmount);
+        shoppingCartGoodsResponseVo.setTotalAmount(shoppingCartGoodsResponseVo.getTotalAmount() + productGroupTotalAmount);
         //总优惠=促销总优惠 + (套餐总原件 - 套餐总finalPrice - 可选商品总售价)
 //        shoppingCartGoodsResponseVo.setTotalDiscountAmount(shoppingCartGoodsResponseVo.getTotalDiscountAmount() + totalOriginalPrice - totalFinalPrice - productGroupTotalAmount);
     }