依据促销 设置 套餐划线价展示问题

Signed-off-by: 周晓航 <xiaohang.zhou@freemud.com>

assortment-shoppingcart-sdk/src/main/java/com/freemud/sdk/api/assortment/shoppingcart/adapter/ShoppingCartAdapter.java

@@ -340,8 +340,8 @@ public class ShoppingCartAdapter {
             //更新当前商品行价格
             Long newOrigOriginalPrice = 0L;
             if (isSetMealProduct) {
+                // fisherman ---> 套餐划线价取值--> 根据商户号配置 取值不同
                 newOrigOriginalPrice += cartGoods.getProductComboList().stream().mapToLong(t -> t.getOriginalAmount()).sum();
-                newOrigOriginalPrice += cartGoods.getProductGroupList().stream().mapToLong(t -> t.getOriginalAmount()).sum();
             } else {
                 newOrigOriginalPrice = isSkuProduct ? skuProduct.getFinalPrice() : spuProduct.getFinalPrice();
             }

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

@@ -83,11 +83,12 @@ public class CalculationCommonService {
         for (CartGoods cartGoods : cartGoodsList) {
             originalAmount = 0L;amount = 0L;packageAmount = 0L;
 
+            this.rowRealAmount(goods, cartGoods, couponCode);
+
             //原价行记录
             originalAmount = cartGoods.getOriginalPrice() * cartGoods.getQty();
             cartGoods.setOriginalAmount(originalAmount);
 
-            this.rowRealAmount(goods, cartGoods, couponCode);
             //成交价行记录
             amount = cartGoods.getAmount();
             totalAmount += amount;
@@ -222,6 +223,7 @@ public class CalculationCommonService {
         }
         if (GoodsTypeEnum.SET_MEAL_GOODS.getGoodsType().equals(cartGoods.getGoodsType())) {
             cartGoods.setOriginalAmount(originPrice);
+            cartGoods.setOriginalPrice(find.getOriginalPrice());
         }
 
     }
@@ -500,19 +502,26 @@ public class CalculationCommonService {
         /**
          * 固定搭配
          * productComboList
+         * fisherman 固定搭配套餐价设置,促销不计算可选搭配价格
          */
         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());
-            for (ShoppingCartGoodsDto.CartGoodsDetailDto comboList : comboLists) {
-                originalPriceSum += (comboList.getQty() / cartGoods.getQty()) * comboList.getOriginalPrice();
-            }
+        if (calculationGoods !=null) {
+            originalPriceSum = calculationGoods.getOriginalPrice();
             cartGoodsDetailDto.setOriginalPrice(originalPriceSum);
+        }else {
+            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());
+                for (ShoppingCartGoodsDto.CartGoodsDetailDto comboList : comboLists) {
+                    originalPriceSum += (comboList.getQty() / cartGoods.getQty()) * comboList.getOriginalPrice();
+                }
+                cartGoodsDetailDto.setOriginalPrice(originalPriceSum);
+            }
         }
+
         /**
          * 可选商品
          * productGroupList