modify:排序

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

@@ -193,21 +193,18 @@ public class FullPromotionService implements IPromotionService {
                 notInShopping.setTipType(7);
             }
             //int len = benefitBeanDto.getSendGoodsList().size();
-
-            for (BenefitBeanDto beanDto : benefitBeanDtos) {
-                notInShopping.setSatisfy(WebUtil.formatAmount(beanDto.getThresholdAmount() * 1.00 / 100).toString());
-                int len = beanDto.getSendGoodsList().size();
-                List<ActivityList.SendGoods> sends = new ArrayList();
-                for (int i = len - 1; i >= 0; i--) {
-                    ActivityList.SendGoods goods = new ActivityList.SendGoods();
-                    goods.setQty(beanDto.getSendGoodsList().get(i).getSendNumber());
-                    goods.setGoodsName(beanDto.getSendGoodsList().get(i).getGoodsName());
-                    sends.add(goods);
-                }
-                notInShopping.setSends(sends);
-                break;
+            Collections.sort(benefitBeanDtos);
+            BenefitBeanDto dto = benefitBeanDtos.get(0);
+            int len = dto.getSendGoodsList().size();
+            notInShopping.setSatisfy(WebUtil.formatAmount(dto.getThresholdAmount() * 1.00 / 100).toString());
+            List<ActivityList.SendGoods> sends = new ArrayList();
+            for (int i = len - 1; i >= 0; i--) {
+                ActivityList.SendGoods goods = new ActivityList.SendGoods();
+                goods.setQty(dto.getSendGoodsList().get(i).getSendNumber());
+                goods.setGoodsName(dto.getSendGoodsList().get(i).getGoodsName());
+                sends.add(goods);
             }
-
+            notInShopping.setSends(sends);
             activityList.add(notInShopping);
         }
     }

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

@@ -285,18 +285,16 @@ public class FullSharingService {
             else if (GiftTypeEnum.TYPE_2.equals(activityResponseDto.getActivitySubType())) {
                 notInShopping.setTipType(7);
             }
-            for (BenefitBeanDto beanDto : benefitBeanDtos) {
-                notInShopping.setSatisfy(WebUtil.formatAmount(beanDto.getThresholdAmount() * 1.00 / 100).toString());
-                int len = beanDto.getSendGoodsList().size();
-                List<ActivityList.SendGoods> sends = new ArrayList();
-                for (int i = len - 1; i >= 0; i--) {
-                    ActivityList.SendGoods goods = new ActivityList.SendGoods();
-                    goods.setQty(beanDto.getSendGoodsList().get(i).getSendNumber());
-                    goods.setGoodsName(beanDto.getSendGoodsList().get(i).getGoodsName());
-                    sends.add(goods);
-                }
-                notInShopping.setSends(sends);
-                break;
+            Collections.sort(benefitBeanDtos);
+            BenefitBeanDto dto = benefitBeanDtos.get(0);
+            int len = dto.getSendGoodsList().size();
+            notInShopping.setSatisfy(WebUtil.formatAmount(dto.getThresholdAmount() * 1.00 / 100).toString());
+            List<ActivityList.SendGoods> sends = new ArrayList();
+            for (int i = len - 1; i >= 0; i--) {
+                ActivityList.SendGoods goods = new ActivityList.SendGoods();
+                goods.setQty(dto.getSendGoodsList().get(i).getSendNumber());
+                goods.setGoodsName(dto.getSendGoodsList().get(i).getGoodsName());
+                sends.add(goods);
             }
             activityList.add(notInShopping);
         }