From 1e2989fdc50019008cf0ecffea8fb20dc0049b70 Mon Sep 17 00:00:00 2001
From: puzhibing <393733352@qq.com>
Date: 星期一, 11 五月 2026 19:21:42 +0800
Subject: [PATCH] Merge remote-tracking branch 'origin/1.0' into 1.0
---
xp-robotaxi-order-boot/src/main/java/com/xiaopeng/order/service/impl/XpOrderServiceImpl.java | 8 ++++----
1 files changed, 4 insertions(+), 4 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 6ad9a0a..eae80ab 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
@@ -1677,11 +1677,11 @@
if(!data.isEmpty()){
//收藏的数据
List<XpHistoryStartPointsVo> collect = data.stream().filter(s -> s.getIsCollect() == 1).collect(Collectors.toList());
- collect.sort(Comparator.comparingInt(XpHistoryStartPointsVo::getNum).reversed());
+ collect.sort((o1, o2)->o1.getDistance().compareTo(o2.getDistance()) * -1);
objects.addAll(collect);
//非收藏的数据
List<XpHistoryStartPointsVo> collect1 = data.stream().filter(s -> s.getIsCollect() == 2).collect(Collectors.toList());
- collect1.sort(Comparator.comparingInt(XpHistoryStartPointsVo::getNum).reversed());
+ collect1.sort((o1, o2)->o1.getDistance().compareTo(o2.getDistance()) * -1);
objects.addAll(collect1);
}
return objects;
@@ -1716,11 +1716,11 @@
if(!data.isEmpty()){
//收藏的数据
List<XpHistoryEndPointsVo> collect = data.stream().filter(s -> s.getIsCollect() == 1).collect(Collectors.toList());
- collect.sort(Comparator.comparingInt(XpHistoryEndPointsVo::getNum).reversed());
+ collect.sort((o1, o2)->o1.getDistance().compareTo(o2.getDistance()) * -1);
objects.addAll(collect);
//非收藏的数据
List<XpHistoryEndPointsVo> collect1 = data.stream().filter(s -> s.getIsCollect() == 2).collect(Collectors.toList());
- collect1.sort(Comparator.comparingInt(XpHistoryEndPointsVo::getNum).reversed());
+ collect1.sort((o1, o2)->o1.getDistance().compareTo(o2.getDistance()) * -1);
objects.addAll(collect1);
}
return objects;
--
Gitblit v1.7.1