|
@@ -206,7 +206,7 @@ public class ActivityServiceImpl extends ServiceImpl<ActivityDao, Activity> impl
|
|
|
return curShopActivityBOs.stream()
|
|
return curShopActivityBOs.stream()
|
|
|
.map(shopActivityBO -> calcOrderSuitActivity(shopActivityBO, orderGoodsList))
|
|
.map(shopActivityBO -> calcOrderSuitActivity(shopActivityBO, orderGoodsList))
|
|
|
.filter(Objects::nonNull)
|
|
.filter(Objects::nonNull)
|
|
|
- .sorted(Comparator.comparing(OrderSuitActivityVO::getDiscountAmount))
|
|
|
|
|
|
|
+ .sorted(Comparator.comparing(OrderSuitActivityVO::getDiscountAmount).reversed())
|
|
|
.collect(Collectors.toList());
|
|
.collect(Collectors.toList());
|
|
|
}
|
|
}
|
|
|
|
|
|