套餐商品均摊

order-application-service/src/main/java/cn/freemud/service/impl/SetMealPromotionService.java

@@ -69,7 +69,7 @@ public class SetMealPromotionService implements IPromotionService {
             Long productGroupDiscountAmount = productBean.getComboProduct().stream().filter(t -> !t.getIsFixedProduct()).mapToLong(t -> t.getPrice() * t.getNumber() - t.getSettlementPrice()).sum();
             totalDiscountAmount += discountAmount - productGroupDiscountAmount;
             // 设置套餐主商品
-            ShoppingCartGoodsResponse.CartGoodsDetailDto cartGoodsDetailDto = PromotionAdapter.convertCartGoods2DetailGoods(productBean, discountAmount.intValue(), apportionGoodsList, duplicateGoodsMap,true);
+            ShoppingCartGoodsResponse.CartGoodsDetailDto cartGoodsDetailDto = PromotionAdapter.convertCartGoods2DetailGoods(productBean, discountAmount.intValue(), apportionGoodsList, duplicateGoodsMap, isApportion);
             cartGoodsDetailDto.getActivityDiscountsDtos().add(getActivityDiscountsDto(discountAmount.intValue() - productGroupDiscountAmount.intValue()));
             long apportionAmount = cartGoodsDetailDto.getTotalDiscountAmount() - discountAmount;
             Long comboFixedProductTotalDiscountAmount = discountAmount - productGroupDiscountAmount + apportionAmount;