benefitBeanDtos.get(0)报错修改，判断benefitBeanDtos集合不为空

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

@@ -77,9 +77,8 @@ public class FullPromotionService implements IPromotionService {
         if (calculationDiscountResult == null) {
             // 因为没有促销活动的计算信息，所以没有加入购物车内
             List<BenefitBeanDto> benefitBeanDtos = activityResponseDto.getBenefits();
-            BenefitBeanDto benefitBeanDto = benefitBeanDtos.get(0);
             //调用没有加入购物车的提示语的方法
-            setMessageNotInShoppingCart(messageBuilder, activityResponseDto, benefitBeanDtos, benefitBeanDto, activityList);
+            setMessageNotInShoppingCart(messageBuilder, activityResponseDto, benefitBeanDtos, activityList);
         }
         else{
             //促销返回满减提示语
@@ -134,8 +133,13 @@ public class FullPromotionService implements IPromotionService {
     }
 
     //设置没有加入购物车的提示语
-    private void setMessageNotInShoppingCart(StringBuilder messageBuilder, ActivityResponseDto activityResponseDto, List<BenefitBeanDto> benefitBeanDtos, BenefitBeanDto benefitBeanDto,
+    private void setMessageNotInShoppingCart(StringBuilder messageBuilder, ActivityResponseDto activityResponseDto,
+                                             List<BenefitBeanDto> benefitBeanDtos,
                                              ArrayList<ActivityList> activityList) {
+        if(CollectionUtils.isEmpty(benefitBeanDtos)){
+            return;
+        }
+        BenefitBeanDto benefitBeanDto = benefitBeanDtos.get(0);
         if (Objects.equals(ActivityTypeEnum.TYPE_11.getCode(), activityResponseDto.getActivityType())) {
             messageBuilder.append("每满 <span style=\"color:#fa5555\">")
                     .append(WebUtil.formatAmount(benefitBeanDto.getThresholdAmount() * 1.00 / 100))
@@ -189,7 +193,6 @@ public class FullPromotionService implements IPromotionService {
             else if (GiftTypeEnum.TYPE_2.getType().equals(activityResponseDto.getActivitySubType())) {
                 notInShopping.setTipType(7);
             }
-            //int len = benefitBeanDto.getSendGoodsList().size();
             Collections.sort(benefitBeanDtos);
             BenefitBeanDto dto = benefitBeanDtos.get(0);
             int len = dto.getSendGoodsList().size();

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

@@ -79,9 +79,8 @@ public class FullSharingService {
             ArrayList<ActivityList> activityList = new ArrayList<>();
 
             List<BenefitBeanDto> benefitBeanDtos = activityResponseDto.getBenefits();
-            BenefitBeanDto benefitBeanDto = benefitBeanDtos.get(0);
             //调用没有加入购物车的提示语的方法
-            setMessageNotInShoppingCart(messageBuilder, activityResponseDto, benefitBeanDtos, benefitBeanDto, activityList);
+            setMessageNotInShoppingCart(messageBuilder, activityResponseDto, benefitBeanDtos, activityList);
 
             promotionMessageDto.setPromotionMessage(messageBuilder.toString());
             ActivityTip activityTip = new ActivityTip();
@@ -189,9 +188,8 @@ public class FullSharingService {
          */
         if (null==discountResult) {
             List<BenefitBeanDto> benefitBeanDtos = activityResponseDto.getBenefits();
-            BenefitBeanDto benefitBeanDto = benefitBeanDtos.get(0);
             //调用没有加入购物车的提示语的方法
-            setMessageNotInShoppingCart(messageBuilder, activityResponseDto, benefitBeanDtos, benefitBeanDto, activityList);
+            setMessageNotInShoppingCart(messageBuilder, activityResponseDto, benefitBeanDtos, activityList);
         }
         //促销返回满减提示语
         else {
@@ -226,12 +224,14 @@ public class FullSharingService {
      * @param messageBuilder
      * @param activityResponseDto
      * @param benefitBeanDtos
-     * @param benefitBeanDto
      * @param activityList
      */
-    private void setMessageNotInShoppingCart(StringBuilder messageBuilder, ActivityResponseDto activityResponseDto, List<BenefitBeanDto> benefitBeanDtos, BenefitBeanDto benefitBeanDto,
-                                             ArrayList<ActivityList> activityList) {
-
+    private void setMessageNotInShoppingCart(StringBuilder messageBuilder, ActivityResponseDto activityResponseDto,
+                                             List<BenefitBeanDto> benefitBeanDtos,ArrayList<ActivityList> activityList) {
+        if(CollectionUtils.isEmpty(benefitBeanDtos)){
+            return;
+        }
+        BenefitBeanDto benefitBeanDto = benefitBeanDtos.get(0);
         if (Objects.equals(ActivityTypeEnum.TYPE_11.getCode(), activityResponseDto.getActivityType())) {
             messageBuilder.append("每满 <span style=\"color:#fa5555\">")
                     .append(WebUtil.formatAmount(benefitBeanDto.getThresholdAmount() * 1.00 / 100))

shopping-cart-application-service/src/main/java/cn/freemud/service/impl/mcoffee/calculation/FullPromotionCalculation.java

@@ -70,9 +70,8 @@ public class FullPromotionCalculation {
         if (calculationDiscountResult == null) {
             // 因为没有促销活动的计算信息，所以没有加入购物车内
             List<BenefitBeanDto> benefitBeanDtos = activityResponseDto.getBenefits();
-            BenefitBeanDto benefitBeanDto = benefitBeanDtos.get(0);
             //调用没有加入购物车的提示语的方法
-            setMessageNotInShoppingCart(messageBuilder, activityResponseDto, benefitBeanDtos, benefitBeanDto, activityList);
+            setMessageNotInShoppingCart(messageBuilder, activityResponseDto, benefitBeanDtos, activityList);
         } else {
             //促销返回满减提示语
             List<ActivityCalculationDiscountResponseDto.CalculationDiscountResult.ActivityPrompt> activityPrompts = calculationDiscountResult.getActivityPrompts();
@@ -130,8 +129,12 @@ public class FullPromotionCalculation {
 
 
     //设置没有加入购物车的提示语
-    private void setMessageNotInShoppingCart(StringBuilder messageBuilder, ActivityResponseDto activityResponseDto, List<BenefitBeanDto> benefitBeanDtos, BenefitBeanDto benefitBeanDto,
-                                             ArrayList<ActivityList> activityList) {
+    private void setMessageNotInShoppingCart(StringBuilder messageBuilder, ActivityResponseDto activityResponseDto,
+                                             List<BenefitBeanDto> benefitBeanDtos, ArrayList<ActivityList> activityList) {
+        if(CollectionUtils.isEmpty(benefitBeanDtos)){
+            return;
+        }
+        BenefitBeanDto benefitBeanDto = benefitBeanDtos.get(0);
         if (Objects.equals(ActivityTypeEnum.TYPE_11.getCode(), activityResponseDto.getActivityType())) {
             messageBuilder.append("每满 <span style=\"color:#fa5555\">")
                     .append(WebUtil.formatAmount(benefitBeanDto.getThresholdAmount() * 1.00 / 100))