modify:满减过滤

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

@@ -100,7 +100,7 @@ public class FullSharingService {
         List<CalculationSharingDiscountResponseDto.CalculationDiscountResult.Discount> fullDiscountsList = discounts
                 .stream()
                 .filter(d -> ActivityTypeEnum.TYPE_11.getCode().equals(d.getType())
-                        || ActivityTypeEnum.TYPE_12.getCode().equals(d.getType()) || ActivityTypeEnum.TYPE_230.getCode().equals(d.getType()))
+                        || ActivityTypeEnum.TYPE_12.getCode().equals(d.getType()))
                 .collect(Collectors.toList());
         /**
          * 设置到响应中 总的满减优惠金额
@@ -113,7 +113,6 @@ public class FullSharingService {
         }
 
         shoppingCartGoodsResponseVo.setActivityTip(new ActivityTip());
-
         List<Integer> typeEnums = activityTypeEnums.stream().map(ActivityTypeEnum::getCode).collect(Collectors.toList());
         /**
          * 还原满减折扣到行记录上
@@ -135,7 +134,7 @@ public class FullSharingService {
                 //discount = discountMap.getDiscounts().stream().filter(d -> typeEnums.contains(d.getType())).findFirst().orElse(null);
                 sum = discountMap.getDiscounts()
                         .stream()
-                        .filter(d -> typeEnums.contains(d.getType()))
+                        .filter(d -> typeEnums.contains(d.getType()) && !d.getType().equals(ActivityTypeEnum.TYPE_230.getCode()))
                         .mapToLong(CalculationSharingDiscountResponseDto.CalculationDiscountResult.Goods.GoodsDiscount::getDiscount)
                         .sum();
                 cart.setAmount(cart.getAmount() + sum);