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

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

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

@@ -506,22 +506,22 @@ public class CalculationCommonService {
          */
         Long originalPriceSum = 0L;
         List<ShoppingCartGoodsDto.CartGoodsDetailDto> combs = new ArrayList<>();
-        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());
+        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());
+            if (calculationGoods !=null) {
+                originalPriceSum = calculationGoods.getOriginalPrice();
+            }else {
                 for (ShoppingCartGoodsDto.CartGoodsDetailDto comboList : comboLists) {
                     originalPriceSum += (comboList.getQty() / cartGoods.getQty()) * comboList.getOriginalPrice();
                 }
-                cartGoodsDetailDto.setOriginalPrice(originalPriceSum);
             }
+            cartGoodsDetailDto.setOriginalPrice(originalPriceSum);
         }
 
+
         /**
          * 可选商品
          * productGroupList