没有满减时

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

@@ -386,11 +386,12 @@ public abstract class AbstractAddGoodsService implements AddGoodsService {
         ActivityBO activityBO = setMessageBO.getActivityBO();
         List<ActivityList> activityList = null;
         if (discountResult == null || CollectionUtils.isEmpty(discountResult.getGoods())) {
-
+            if (activityBO != null && CollectionUtils.isNotEmpty(activityBO.getBenefits())) {
                 List<BenefitBeanBO> benefitBeanBOList = activityBO.getBenefits();
                 BenefitBeanBO benefitBeanBO = benefitBeanBOList.get(0);
                 //调用没有加入购物车的提示语的方法
                 activityList = setMessageNotInShoppingCart(messageBuilder, activityBO, benefitBeanBOList, benefitBeanBO);
+            }
         } else {
             //促销返回满减提示语
             List<CalculationDiscountBO.CalculationDiscountResult.ActivityPrompt> activityPrompts = discountResult.getActivityPrompts();

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

@@ -315,12 +315,12 @@ public class AbstractListCartGoodsService implements ListCartGoodsService {
         ActivityBO activityBO = setMessageBO.getActivityBO();
         List<ActivityList> activityList = null;
         if (activityBO != null && (discountResult == null || CollectionUtils.isEmpty(discountResult.getGoods()))) {
-
+            if (activityBO != null && CollectionUtils.isNotEmpty(activityBO.getBenefits())) {
                 List<BenefitBeanBO> benefitBeanBOList = activityBO.getBenefits();
                 BenefitBeanBO benefitBeanBO = benefitBeanBOList.get(0);
                 //调用没有加入购物车的提示语的方法
                 activityList = setMessageNotInShoppingCart(messageBuilder, activityBO, benefitBeanBOList, benefitBeanBO);
-
+            }
         }
         //促销返回满减提示语
         List<CalculationDiscountBO.CalculationDiscountResult.ActivityPrompt> activityPrompts = null;

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

@@ -350,12 +350,12 @@ public abstract class AbstractUpdateGoodsQtyService implements UpdateGoodsQtySer
         ActivityBO activityBO = setMessageBO.getActivityBO();
         List<ActivityList> activityList = null;
         if (discountResult == null || CollectionUtils.isEmpty(discountResult.getGoods())) {
-
+            if (activityBO != null && CollectionUtils.isNotEmpty(activityBO.getBenefits())) {
                 List<BenefitBeanBO> benefitBeanBOList = activityBO.getBenefits();
                 BenefitBeanBO benefitBeanBO = benefitBeanBOList.get(0);
                 //调用没有加入购物车的提示语的方法
                 activityList = setMessageNotInShoppingCart(messageBuilder, activityBO, benefitBeanBOList, benefitBeanBO);
-
+            }
 
         } else {
             //促销返回满减提示语