Merge remote-tracking branch 'origin/feature/促销算价基于最新master的分支' into feature/促销算价基于最新master的分支

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

@@ -337,7 +337,7 @@ public class CalculationCommonService {
         cartGoodsDetailDto.setOriginalPrice(cartGoods.getOriginalPrice());
         if (calculationGoods!=null) {
             cartGoodsDetailDto.setTotalDiscountAmount(calculationGoods.getDiscountAmount().intValue());
-            cartGoodsDetailDto.setOriginalPrice(calculationGoods.getOriginalPrice());
+            //cartGoodsDetailDto.setOriginalPrice(calculationGoods.getOriginalPrice());
         }
         else {
             cartGoodsDetailDto.setTotalDiscountAmount(cartGoods.getOriginalAmount().intValue() - cartGoods.getAmount().intValue());
@@ -414,9 +414,9 @@ public class CalculationCommonService {
             originalPriceSum = 0L;
             for (ShoppingCartGoodsDto.CartGoodsDetailDto goodsDetailDto : groupList) {
                 //originalPriceSum += goodsDetailDto.getOriginalPrice() * (goodsDetailDto.getQty() / cartGoods.getQty());
-                originalPriceSum += goodsDetailDto.getOriginalPrice() * cartGoods.getQty();
+                //originalPriceSum += goodsDetailDto.getOriginalPrice() * cartGoods.getQty();
             }
-            cartGoodsDetailDto.setOriginalPrice(cartGoodsDetailDto.getOriginalPrice()+originalPriceSum);
+            //cartGoodsDetailDto.setOriginalPrice(cartGoodsDetailDto.getOriginalPrice()+originalPriceSum);
         }
         cartGoodsDetailDto.setComboProducts(combs);
         List<ShoppingCartGoodsDto.CartGoodsDetailDto.CartGoodsExtra> cartGoodsExtras = BeanUtil.convertBeans(cartGoods.getExtra(), ShoppingCartGoodsDto.CartGoodsDetailDto.CartGoodsExtra::new);