From f94421d09d6d21e3ce8c387e2d3d668243003787 Mon Sep 17 00:00:00 2001
From: guyue <1721849008@qq.com>
Date: 星期五, 01 八月 2025 11:20:37 +0800
Subject: [PATCH] 行程单只查待评价和已完成
---
UserQYTTravel/guns-admin/src/main/java/com/stylefeng/guns/modular/api/OrderController.java | 9 ++++++---
1 files changed, 6 insertions(+), 3 deletions(-)
diff --git a/UserQYTTravel/guns-admin/src/main/java/com/stylefeng/guns/modular/api/OrderController.java b/UserQYTTravel/guns-admin/src/main/java/com/stylefeng/guns/modular/api/OrderController.java
index 85f4e01..4b70b28 100644
--- a/UserQYTTravel/guns-admin/src/main/java/com/stylefeng/guns/modular/api/OrderController.java
+++ b/UserQYTTravel/guns-admin/src/main/java/com/stylefeng/guns/modular/api/OrderController.java
@@ -2252,7 +2252,7 @@
if (da == null && db == null) return 0;
if (da == null) return 1; // a 在后面
if (db == null) return -1; // b 在后面
- return db.compareTo(da); // 都不为空，再按时间倒序
+ return da.compareTo(db); // 按时间正序（升序）排列
});
// 将经纬度转换为城市并设置到数据中
if (list != null && !list.isEmpty()) {
@@ -2340,12 +2340,13 @@
*/
private List<TripOrderVo> queryOrdersByTypeAndIds(Integer userId, Integer orderType, List<Integer> orderIds) throws InvocationTargetException, IllegalAccessException {
List<TripOrderVo> orderList = new ArrayList<>();
-
+ List<Integer> states = Arrays.asList(8, 9);
// 根据订单类型查询对应表的订单
switch (orderType) {
case 1:
EntityWrapper<OrderPrivateCar> wrapper = new EntityWrapper<>();
wrapper.in("id", orderIds);
+ wrapper.in("state", states);
List<OrderPrivateCar> orderPrivateCars = orderPrivateCarService.selectList(wrapper);
for (OrderPrivateCar orderPrivateCar : orderPrivateCars) {
TripOrderVo vo = new TripOrderVo();
@@ -2356,6 +2357,7 @@
case 2:
EntityWrapper<OrderTaxi> wrapper2 = new EntityWrapper<>();
wrapper2.in("id", orderIds);
+ wrapper2.in("state", states);
List<OrderTaxi> orderTaxis = orderTaxiService.selectList(wrapper2);
for (OrderTaxi orderTaxi : orderTaxis) {
TripOrderVo vo = new TripOrderVo();
@@ -2366,6 +2368,7 @@
case 3:
EntityWrapper<OrderCrossCity> wrapper3 = new EntityWrapper<>();
wrapper3.in("id", orderIds);
+ wrapper3.in("state", states);
List<OrderCrossCity> orderCrossCities = orderCrossCityService.selectList(wrapper3);
for (OrderCrossCity orderCrossCity : orderCrossCities) {
TripOrderVo vo = new TripOrderVo();
@@ -2382,7 +2385,7 @@
if (da == null && db == null) return 0;
if (da == null) return 1; // a 在后面
if (db == null) return -1; // b 在后面
- return db.compareTo(da); // 都不为空，再按时间倒序
+ return da.compareTo(db); // 按时间正序（升序）排列
});
--
Gitblit v1.7.1