modify:排序

shopping-cart-application-service/src/main/java/cn/freemud/entities/dto/BenefitBeanDto.java

@@ -8,7 +8,7 @@ import java.util.ArrayList;
 import java.util.List;
 
 @Data
-public class BenefitBeanDto {
+public class BenefitBeanDto implements Comparable<BenefitBeanDto>{
     /**
      * 优惠券名称
      */
@@ -29,6 +29,11 @@ public class BenefitBeanDto {
     private Integer benefitType;
     private List<ActivitySendGoodsVO> sendGoodsList;
 
+    @Override
+    public int compareTo(BenefitBeanDto o) {
+        return  this.thresholdAmount.compareTo(o.getThresholdAmount());
+    }
+
     @Data
     public static class ActivitySendGoodsVO {
         /**

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

@@ -15,10 +15,7 @@ import org.apache.commons.collections4.CollectionUtils;
 import org.springframework.beans.factory.annotation.Autowired;
 import org.springframework.stereotype.Service;
 
-import java.util.ArrayList;
-import java.util.Arrays;
-import java.util.List;
-import java.util.Objects;
+import java.util.*;
 import java.util.stream.Collectors;
 
 /**
@@ -219,9 +216,11 @@ public class FullSubtractionActivityServiceImpl {
             // 没有加入购物车
             if (calculationDiscountResult == null) {
                 List<BenefitBeanDto> benefitBeanDtos = activityResponseDto.getBenefits();
-                BenefitBeanDto benefitBeanDto = benefitBeanDtos.get(0);
+                //BenefitBeanDto benefitBeanDto = benefitBeanDtos.get(0);
+                BenefitBeanDto benefitBeanDto = null;
                 // 每满减
                 if (Objects.equals(ActivityTypeEnum.TYPE_11.getCode(), activityResponseDto.getActivityType())) {
+                    benefitBeanDto = benefitBeanDtos.get(0);
                     messageBuilder.append("每满 <span style=\"color:#fa5555\">")
                             .append(WebUtil.formatAmount(benefitBeanDto.getThresholdAmount() * 1.00 / 100))
                             .append("</span> 减 <span style=\"color:#fa5555\">")
@@ -239,6 +238,7 @@ public class FullSubtractionActivityServiceImpl {
                     activityList.add(notInShopping);
                 }
                 if (Objects.equals(ActivityTypeEnum.TYPE_12.getCode(), activityResponseDto.getActivityType())) {
+                    benefitBeanDto = benefitBeanDtos.get(0);
                     int len = benefitBeanDtos.size();
                     // // 购物车中无商品或者存在与满减互斥的活动
                     for (int i = len - 1, j = 0; i >= 0 && j < 2; i--, j++) {
@@ -261,6 +261,8 @@ public class FullSubtractionActivityServiceImpl {
                     }
                 }
                 if (Objects.equals(ActivityTypeEnum.TYPE_230.getCode(), activityResponseDto.getActivityType())) {
+                    Collections.sort(benefitBeanDtos);
+                    benefitBeanDto = benefitBeanDtos.get(0);
                     ActivityList notInShopping = new ActivityList();
                     // 规则:满5赠奶茶2件，炸鸡1件，满10赠布丁3件，牛奶1份，鸡翅2份，
                     // 提示语：满5元可获赠奶茶*2，炸鸡*1

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

@@ -298,6 +298,7 @@ public class FullSharingService {
                 notInShopping.setSends(sends);
                 break;
             }
+            activityList.add(notInShopping);
         }
     }