对接促销算价Alpha->fix 固定搭配组

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

@@ -412,8 +412,7 @@ public class CalculationCommonService {
             cartGoodsDetailDto.setTotalDiscountAmount(cartGoodsDetailDto.getTotalDiscountAmount() + discountSum);
             originalPriceSum = 0L;
             for (ShoppingCartGoodsDto.CartGoodsDetailDto goodsDetailDto : groupList) {
-                originalPriceSum += goodsDetailDto.getOriginalPrice();
-                //originalPriceSum += goodsDetailDto.getOriginalPrice()*goodsDetailDto.getQty();
+                originalPriceSum += goodsDetailDto.getOriginalPrice() * cartGoods.getQty();
             }
             cartGoodsDetailDto.setOriginalPrice(cartGoodsDetailDto.getOriginalPrice()+originalPriceSum);
         }
@@ -442,7 +441,6 @@ public class CalculationCommonService {
             com.setSkuId(comb.getGoodsId());
             com.setSkuName(StringUtils.isEmpty(comb.getSkuName()) ? com.getSpuName() : com.getSkuName());
             com.setPicture(comb.getPic());
-            com.setQty(comb.getQty());
             com.setProductType(comb.isWeightType() ? ProductType.WEIGHT_PRODUCT.getCode() : ProductType.SETMEAL.getCode());
             com.setParentProductId(cartGoods.getGoodsId());
             com.setIsFixedProduct(isFixed);
@@ -455,7 +453,8 @@ public class CalculationCommonService {
             if (isFixed) {
                 com.setOriginalPrice(comb.getFinalPrice());
             } else {
-                com.setOriginalPrice(comb.getFinalPrice() * comb.getQty());
+                com.setQty(comb.getQty() * cartGoods.getQty());
+                com.setOriginalPrice(comb.getFinalPrice());
             }
 
             //todo