Skip to content

O
order-group
Commit e16b4455 by xiaoer.li@freemud.com
Options

modify:排序

parent 8df006c0
Showing with 12 additions and 17 deletions
shopping-cart-application-service/src/main/java/cn/freemud/service/impl/FullPromotionService.java
...@@ -193,21 +193,18 @@ public class FullPromotionService implements IPromotionService { ...@@ -193,21 +193,18 @@ public class FullPromotionService implements IPromotionService {
notInShopping.setTipType(7); notInShopping.setTipType(7);
} }
//int len = benefitBeanDto.getSendGoodsList().size(); //int len = benefitBeanDto.getSendGoodsList().size();
Collections.sort(benefitBeanDtos);
for (BenefitBeanDto beanDto : benefitBeanDtos) { BenefitBeanDto dto = benefitBeanDtos.get(0);
notInShopping.setSatisfy(WebUtil.formatAmount(beanDto.getThresholdAmount() * 1.00 / 100).toString()); int len = dto.getSendGoodsList().size();
int len = beanDto.getSendGoodsList().size(); notInShopping.setSatisfy(WebUtil.formatAmount(dto.getThresholdAmount() * 1.00 / 100).toString());
List<ActivityList.SendGoods> sends = new ArrayList(); List<ActivityList.SendGoods> sends = new ArrayList();
for (int i = len - 1; i >= 0; i--) { for (int i = len - 1; i >= 0; i--) {
ActivityList.SendGoods goods = new ActivityList.SendGoods(); ActivityList.SendGoods goods = new ActivityList.SendGoods();
goods.setQty(beanDto.getSendGoodsList().get(i).getSendNumber()); goods.setQty(dto.getSendGoodsList().get(i).getSendNumber());
goods.setGoodsName(beanDto.getSendGoodsList().get(i).getGoodsName()); goods.setGoodsName(dto.getSendGoodsList().get(i).getGoodsName());
sends.add(goods); sends.add(goods);
} }
notInShopping.setSends(sends); notInShopping.setSends(sends);
break;
}
activityList.add(notInShopping); activityList.add(notInShopping);
} }
} }
......
shopping-cart-application-service/src/main/java/cn/freemud/service/impl/calculate/promotion/FullSharingService.java
...@@ -285,19 +285,17 @@ public class FullSharingService { ...@@ -285,19 +285,17 @@ public class FullSharingService {
else if (GiftTypeEnum.TYPE_2.equals(activityResponseDto.getActivitySubType())) { else if (GiftTypeEnum.TYPE_2.equals(activityResponseDto.getActivitySubType())) {
notInShopping.setTipType(7); notInShopping.setTipType(7);
} }
for (BenefitBeanDto beanDto : benefitBeanDtos) { Collections.sort(benefitBeanDtos);
notInShopping.setSatisfy(WebUtil.formatAmount(beanDto.getThresholdAmount() * 1.00 / 100).toString()); BenefitBeanDto dto = benefitBeanDtos.get(0);
int len = beanDto.getSendGoodsList().size(); int len = dto.getSendGoodsList().size();
notInShopping.setSatisfy(WebUtil.formatAmount(dto.getThresholdAmount() * 1.00 / 100).toString());
List<ActivityList.SendGoods> sends = new ArrayList(); List<ActivityList.SendGoods> sends = new ArrayList();
for (int i = len - 1; i >= 0; i--) { for (int i = len - 1; i >= 0; i--) {
ActivityList.SendGoods goods = new ActivityList.SendGoods(); ActivityList.SendGoods goods = new ActivityList.SendGoods();
goods.setQty(beanDto.getSendGoodsList().get(i).getSendNumber()); goods.setQty(dto.getSendGoodsList().get(i).getSendNumber());
goods.setGoodsName(beanDto.getSendGoodsList().get(i).getGoodsName()); goods.setGoodsName(dto.getSendGoodsList().get(i).getGoodsName());
sends.add(goods); sends.add(goods);
} }
notInShopping.setSends(sends);
break;
}
activityList.add(notInShopping); activityList.add(notInShopping);
} }
} }
......
Markdown is supported
0% or
You are about to add 0 people to the discussion. Proceed with caution.
Finish editing this message first!
Please register or to comment