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

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

@@ -399,7 +399,7 @@ public class CalculationCommonService {
             combs.addAll(comboLists);
             cartGoodsDetailDto.setProductType(ProductType.SETMEAL.getCode());
             for (ShoppingCartGoodsDto.CartGoodsDetailDto comboList : comboLists) {
-                originalPriceSum += comboList.getQty() * comboList.getOriginalPrice();
+                originalPriceSum += (comboList.getQty() / cartGoods.getQty()) * comboList.getOriginalPrice();
             }
             cartGoodsDetailDto.setOriginalPrice(originalPriceSum);
         }
@@ -415,8 +415,8 @@ public class CalculationCommonService {
             cartGoodsDetailDto.setTotalDiscountAmount(cartGoodsDetailDto.getTotalDiscountAmount() + discountSum);
             originalPriceSum = 0L;
             for (ShoppingCartGoodsDto.CartGoodsDetailDto goodsDetailDto : groupList) {
-                //originalPriceSum += goodsDetailDto.getOriginalPrice() * (goodsDetailDto.getQty() / cartGoods.getQty());
-                originalPriceSum += goodsDetailDto.getOriginalPrice() * goodsDetailDto.getQty();
+                originalPriceSum += goodsDetailDto.getOriginalPrice() * (goodsDetailDto.getQty() / cartGoods.getQty());
+                //originalPriceSum += goodsDetailDto.getOriginalPrice() * goodsDetailDto.getQty();
             }
             cartGoodsDetailDto.setOriginalPrice(cartGoodsDetailDto.getOriginalPrice() + originalPriceSum);
         }