modify:均摊

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

@@ -147,8 +147,8 @@ public class BuyAndGiftsPromotionService implements IPromotionService {
             ProductActivityDiscountsDto.setActivityName(sendActivity.getActivityName());
             ProductActivityDiscountsDto.setActivityType(sendActivity.getActivityType());
             if (cartGoodsDetailDto.getActivityType().equals(ActivityTypeEnum.TYPE_230.getCode())) {
-                cartGoodsDetailDto.setTotalDiscountAmount(cartGoodsDetailDto.getOriginalPrice().intValue());
-                ProductActivityDiscountsDto.setDiscountAmount(cartGoodsDetailDto.getOriginalPrice().intValue());
+                cartGoodsDetailDto.setTotalDiscountAmount(cartGoodsDetailDto.getOriginalPrice().intValue()*cartGoodsDetailDto.getQty());
+                ProductActivityDiscountsDto.setDiscountAmount(cartGoodsDetailDto.getOriginalPrice().intValue()*cartGoodsDetailDto.getQty());
             }
             else {
                 ProductActivityDiscountsDto.setDiscountAmount(cartGoodsDetailDto.getTotalDiscountAmount());
@@ -170,7 +170,7 @@ public class BuyAndGiftsPromotionService implements IPromotionService {
             Long totalDiscountOriginalAmount = sendGoodsList
                     .stream()
                     .filter(sendGoods -> ObjectUtils.equals(sendActivity.getActivityCode(), sendGoods.getNodeId()))
-                    .mapToLong(sendGoods -> sendGoods.getOriginalPrice())
+                    .mapToLong(sendGoods -> sendGoods.getOriginalPrice()*sendGoods.getQty())
                     .sum();
             ActivityDiscountsDto activityDiscountsDto = new ActivityDiscountsDto();
             activityDiscountsDto.setActivityCode(sendActivity.getActivityCode());