modify:均摊

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

@@ -145,7 +145,8 @@ public class BuySendPromotionService implements IPromotionService {
             return;
         }
         //添加促销活动
-        List<ActivityCalculationDiscountResponseDto.CalculationDiscountResult.SendActivity> sendGoods1 = calculationDiscountResult.getSendGoods() == null ? new ArrayList<>() : calculationDiscountResult.getSendGoods().stream()
+        List<ActivityCalculationDiscountResponseDto.CalculationDiscountResult.SendActivity> sendGoods1 = calculationDiscountResult.getSendGoods() == null ? new ArrayList<>() :
+                calculationDiscountResult.getSendGoods().stream()
                 .filter(t -> ObjectUtils.equals(ActivityTypeEnum.TYPE_6.getCode(), t.getActivityType())
                 || ObjectUtils.equals(ActivityTypeEnum.TYPE_61.getCode(), t.getActivityType())
                 || ObjectUtils.equals(ActivityTypeEnum.TYPE_230.getCode(), t.getActivityType()))
@@ -157,8 +158,15 @@ public class BuySendPromotionService implements IPromotionService {
             if(ActivityTypeEnum.TYPE_230.getCode().equals(sendActivity.getActivityCode())) {
                 type230 = true;
             }
-            Integer discountAmount = shoppingCartGoodsDto.getProducts().stream().filter(product -> ObjectUtils.equals(product.getActivityType(), sendActivity.getActivityType())).mapToInt(ShoppingCartGoodsDto.CartGoodsDetailDto::getTotalDiscountAmount).sum();
-            Long totalAmount = shoppingCartGoodsDto.getProducts().stream().filter(product -> ObjectUtils.equals(product.getActivityType(), sendActivity.getActivityType())).mapToLong(ShoppingCartGoodsDto.CartGoodsDetailDto::getOriginalPrice).sum();
+            Integer discountAmount = shoppingCartGoodsDto.getProducts()
+                    .stream()
+                    .filter(product -> ObjectUtils.equals(product.getActivityType(), sendActivity.getActivityType()))
+                    .mapToInt(ShoppingCartGoodsDto.CartGoodsDetailDto::getTotalDiscountAmount)
+                    .sum();
+
+            Long totalAmount = sendActivity.getSendGoods().stream()
+                    .mapToLong(ActivityCalculationDiscountResponseDto.CalculationDiscountResult.SendActivity.SendGoods::getOriginalPrice)
+                    .sum();
             //设置优惠活动
             ActivityDiscountsDto activityDiscountsDto = new ActivityDiscountsDto();
             activityDiscountsDto.setActivityCode(sendActivity.getActivityCode());
@@ -168,7 +176,10 @@ public class BuySendPromotionService implements IPromotionService {
             activityDiscountsDtos.add(activityDiscountsDto);
 
             // 设置商品行优惠明细
-            List<ShoppingCartGoodsDto.CartGoodsDetailDto> buyAndSendProducts = shoppingCartGoodsDto.getProducts().stream().filter(product -> ObjectUtils.equals(product.getActivityType(), sendActivity.getActivityType())).collect(Collectors.toList());
+            List<ShoppingCartGoodsDto.CartGoodsDetailDto> buyAndSendProducts = shoppingCartGoodsDto.getProducts()
+                    .stream()
+                    .filter(product -> ObjectUtils.equals(product.getActivityType(), sendActivity.getActivityType()))
+                    .collect(Collectors.toList());
             for (ShoppingCartGoodsDto.CartGoodsDetailDto cartGoodsDetailDto : buyAndSendProducts) {
                 List<ActivityDiscountsDto> activityDiscountsDtoList = cartGoodsDetailDto.getActivityDiscountsDtos() == null ? new ArrayList<>() : cartGoodsDetailDto.getActivityDiscountsDtos();
                 ActivityDiscountsDto ProductActivityDiscountsDto = new ActivityDiscountsDto();