Commit b601fcc6 by 刘鹏飞

集点活动筛选需要判断活动的类型不能为空

parent d83c195d
...@@ -70,7 +70,7 @@ public class GatherSpotPromotionService implements IPromotionService { ...@@ -70,7 +70,7 @@ public class GatherSpotPromotionService implements IPromotionService {
} }
// 活动类型-TYPE_221筛选出集点活动 // 活动类型-TYPE_221筛选出集点活动
List<ActivityCalculationDiscountResponseDto.CalculationDiscountResult.Discount> gatherSpots = calculationDiscountResult.getDiscounts().stream().filter(activityPrompt -> ActivityTypeEnum.TYPE_221.getCode().intValue() == activityPrompt.getType().intValue()).collect(Collectors.toList()); List<ActivityCalculationDiscountResponseDto.CalculationDiscountResult.Discount> gatherSpots = calculationDiscountResult.getDiscounts().stream().filter(activityPrompt -> null == activityPrompt.getType() && ActivityTypeEnum.TYPE_221.getCode().intValue() == activityPrompt.getType().intValue()).collect(Collectors.toList());
if (CollectionUtils.isEmpty(gatherSpots)) { if (CollectionUtils.isEmpty(gatherSpots)) {
return; return;
} }
......
Markdown is supported
0% or
You are about to add 0 people to the discussion. Proceed with caution.
Finish editing this message first!
Please register or to comment