Merge remote-tracking branch 'remotes/origin/feature/gatherSpot-刘鹏飞' into master

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

@@ -70,7 +70,7 @@ public class GatherSpotPromotionService implements IPromotionService {
         }
 
         // 活动类型-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)) {
             return;
         }