From 0310e854ca345f699b2ea8e94d14fc0ecbeb4f50 Mon Sep 17 00:00:00 2001
From: puzhibing <393733352@qq.com>
Date: 星期一, 11 五月 2026 20:47:25 +0800
Subject: [PATCH] 合并代码
---
xp-robotaxi-order-boot/src/main/java/com/xiaopeng/order/service/impl/XpOrderServiceImpl.java | 16 ++++++++--------
1 files changed, 8 insertions(+), 8 deletions(-)
diff --git a/xp-robotaxi-order-boot/src/main/java/com/xiaopeng/order/service/impl/XpOrderServiceImpl.java b/xp-robotaxi-order-boot/src/main/java/com/xiaopeng/order/service/impl/XpOrderServiceImpl.java
index eae80ab..4da14ef 100644
--- a/xp-robotaxi-order-boot/src/main/java/com/xiaopeng/order/service/impl/XpOrderServiceImpl.java
+++ b/xp-robotaxi-order-boot/src/main/java/com/xiaopeng/order/service/impl/XpOrderServiceImpl.java
@@ -1676,12 +1676,12 @@
List<XpHistoryStartPointsVo> objects = new ArrayList<XpHistoryStartPointsVo>();
if(!data.isEmpty()){
//收藏的数据
- List<XpHistoryStartPointsVo> collect = data.stream().filter(s -> s.getIsCollect() == 1).collect(Collectors.toList());
- collect.sort((o1, o2)->o1.getDistance().compareTo(o2.getDistance()) * -1);
+ List<XpHistoryStartPointsVo> collect = data.stream().filter(s -> s.getIsCollect() == 1)
+ .sorted(Comparator.comparing(XpHistoryStartPointsVo::getDistance)).collect(Collectors.toList());
objects.addAll(collect);
//非收藏的数据
- List<XpHistoryStartPointsVo> collect1 = data.stream().filter(s -> s.getIsCollect() == 2).collect(Collectors.toList());
- collect1.sort((o1, o2)->o1.getDistance().compareTo(o2.getDistance()) * -1);
+ List<XpHistoryStartPointsVo> collect1 = data.stream().filter(s -> s.getIsCollect() == 2)
+ .sorted(Comparator.comparing(XpHistoryStartPointsVo::getDistance)).collect(Collectors.toList());
objects.addAll(collect1);
}
return objects;
@@ -1715,12 +1715,12 @@
List<XpHistoryEndPointsVo> objects = new ArrayList<XpHistoryEndPointsVo>();
if(!data.isEmpty()){
//收藏的数据
- List<XpHistoryEndPointsVo> collect = data.stream().filter(s -> s.getIsCollect() == 1).collect(Collectors.toList());
- collect.sort((o1, o2)->o1.getDistance().compareTo(o2.getDistance()) * -1);
+ List<XpHistoryEndPointsVo> collect = data.stream().filter(s -> s.getIsCollect() == 1)
+ .sorted(Comparator.comparing(XpHistoryEndPointsVo::getDistance)).collect(Collectors.toList());
objects.addAll(collect);
//非收藏的数据
- List<XpHistoryEndPointsVo> collect1 = data.stream().filter(s -> s.getIsCollect() == 2).collect(Collectors.toList());
- collect1.sort((o1, o2)->o1.getDistance().compareTo(o2.getDistance()) * -1);
+ List<XpHistoryEndPointsVo> collect1 = data.stream().filter(s -> s.getIsCollect() == 2)
+ .sorted(Comparator.comparing(XpHistoryEndPointsVo::getDistance)).collect(Collectors.toList());
objects.addAll(collect1);
}
return objects;
--
Gitblit v1.7.1