fix:可选商品折扣

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

@@ -390,12 +390,15 @@ public class CalculationCommonService {
          * 固定搭配
          * productComboList
          */
+        Long originalPriceSum = 0L;
         List<ShoppingCartGoodsDto.CartGoodsDetailDto> combs = new ArrayList<>();
         if (CollectionUtils.isNotEmpty(cartGoods.getProductComboList())) {
             HashMap<String, BlockRow> gxDiscount = this.drawnSmallAndGroupRow(calculationGoods, 2, true);
             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);
         }
         /**
          * 可选商品
@@ -404,9 +407,11 @@ public class CalculationCommonService {
         if (CollectionUtils.isNotEmpty(cartGoods.getProductGroupList())) {
             HashMap<String, BlockRow> smDiscount = this.drawnSmallAndGroupRow(calculationGoods, 2, false);
             List<ShoppingCartGoodsDto.CartGoodsDetailDto> groupList = this.com2DetailGoods(smDiscount, cartGoods.getProductGroupList(), cartGoods, false);
+            combs.addAll(groupList);
             int discountSum = groupList.stream().mapToInt(ShoppingCartGoodsDto.CartGoodsDetailDto::getTotalDiscountAmount).sum();
             cartGoodsDetailDto.setTotalDiscountAmount(cartGoodsDetailDto.getTotalDiscountAmount()+discountSum);
-            combs.addAll(groupList);
+            originalPriceSum = groupList.stream().mapToLong(ShoppingCartGoodsDto.CartGoodsDetailDto::getOriginalPrice).sum();
+            cartGoodsDetailDto.setOriginalPrice(cartGoodsDetailDto.getOriginalPrice()+originalPriceSum);
         }
         cartGoodsDetailDto.setComboProducts(combs);
         List<ShoppingCartGoodsDto.CartGoodsDetailDto.CartGoodsExtra> cartGoodsExtras = BeanUtil.convertBeans(cartGoods.getExtra(), ShoppingCartGoodsDto.CartGoodsDetailDto.CartGoodsExtra::new);