From f8c54ebade0d00d7d98e8e694bd99531fae1b8ac Mon Sep 17 00:00:00 2001
From: puzhibing <393733352@qq.com>
Date: 星期一, 11 五月 2026 16:09:51 +0800
Subject: [PATCH] 合并代码
---
xp-robotaxi-order-boot/src/main/java/com/xiaopeng/order/service/impl/XpOrderServiceImpl.java | 30 ++++++++++++++++++++++++------
1 files changed, 24 insertions(+), 6 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 36d3c2c..6ad9a0a 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
@@ -1672,10 +1672,19 @@
}
);
}
- data = data.stream().sorted(Comparator.comparingInt(XpHistoryStartPointsVo::getNum).reversed()).collect(Collectors.toList());
- return data;
-
+ List<XpHistoryStartPointsVo> objects = new ArrayList<XpHistoryStartPointsVo>();
+ if(!data.isEmpty()){
+ //收藏的数据
+ List<XpHistoryStartPointsVo> collect = data.stream().filter(s -> s.getIsCollect() == 1).collect(Collectors.toList());
+ collect.sort(Comparator.comparingInt(XpHistoryStartPointsVo::getNum).reversed());
+ objects.addAll(collect);
+ //非收藏的数据
+ List<XpHistoryStartPointsVo> collect1 = data.stream().filter(s -> s.getIsCollect() == 2).collect(Collectors.toList());
+ collect1.sort(Comparator.comparingInt(XpHistoryStartPointsVo::getNum).reversed());
+ objects.addAll(collect1);
+ }
+ return objects;
}
@Override
@@ -1703,9 +1712,18 @@
}
);
}
- data = data.stream().sorted(Comparator.comparingInt(XpHistoryEndPointsVo::getNum).reversed()).collect(Collectors.toList());
-
- return data;
+ List<XpHistoryEndPointsVo> objects = new ArrayList<XpHistoryEndPointsVo>();
+ if(!data.isEmpty()){
+ //收藏的数据
+ List<XpHistoryEndPointsVo> collect = data.stream().filter(s -> s.getIsCollect() == 1).collect(Collectors.toList());
+ collect.sort(Comparator.comparingInt(XpHistoryEndPointsVo::getNum).reversed());
+ objects.addAll(collect);
+ //非收藏的数据
+ List<XpHistoryEndPointsVo> collect1 = data.stream().filter(s -> s.getIsCollect() == 2).collect(Collectors.toList());
+ collect1.sort(Comparator.comparingInt(XpHistoryEndPointsVo::getNum).reversed());
+ objects.addAll(collect1);
+ }
+ return objects;
}
--
Gitblit v1.7.1