From 39e9e0600ed31ee6eff5c3b1287c36c7b7196b90 Mon Sep 17 00:00:00 2001
From: liujie <1793218484@qq.com>
Date: 星期四, 14 八月 2025 19:11:04 +0800
Subject: [PATCH] Merge branch 'master' of http://120.76.84.145:10101/gitblit/r/java/QianYunTong
---
UserQYTTravel/guns-admin/src/main/java/com/stylefeng/guns/modular/specialTrain/dao/mapping/OrderPrivateCarMapper.xml | 15 ++++++++-------
1 files changed, 8 insertions(+), 7 deletions(-)
diff --git a/UserQYTTravel/guns-admin/src/main/java/com/stylefeng/guns/modular/specialTrain/dao/mapping/OrderPrivateCarMapper.xml b/UserQYTTravel/guns-admin/src/main/java/com/stylefeng/guns/modular/specialTrain/dao/mapping/OrderPrivateCarMapper.xml
index a699ead..8bb3b3d 100644
--- a/UserQYTTravel/guns-admin/src/main/java/com/stylefeng/guns/modular/specialTrain/dao/mapping/OrderPrivateCarMapper.xml
+++ b/UserQYTTravel/guns-admin/src/main/java/com/stylefeng/guns/modular/specialTrain/dao/mapping/OrderPrivateCarMapper.xml
@@ -280,7 +280,7 @@
state as state,
oldState as oldState,
thankYouFee
- from t_order_private_car where userId = #{uid} order by insertTime desc limit #{pageNum}, #{size}
+ from t_order_private_car where userId = #{uid} and isGenerateRecoveryOrder = 0 order by insertTime desc limit #{pageNum}, #{size}
</select>
@@ -584,11 +584,10 @@
<select id="queryMyTripList" resultType="map">
- select
- id as orderId,
- rideType as rideType,
- DATE_FORMAT(insertTime, '%Y-%m-%d %H:%i') as orderTime,
- DATE_FORMAT(travelTime, '%m月?d日 %H:%i') as time,
+ select id as orderId,
+ rideType as rideType,
+ DATE_FORMAT(insertTime, '%Y-%m-%d %H:%i') as orderTime,
+ DATE_FORMAT(travelTime, '%m月?d日 %H:%i') as time,
startAddress as startAddress,
endAddress as endAddress,
driverId as driverId,
@@ -604,7 +603,9 @@
boardingTime,
boardingLon,
boardingLat
- from t_order_private_car where userId = #{uid} and state in (8, 9) order by insertTime desc limit #{pageNum}, #{size}
+ from t_order_private_car
+ where userId = #{uid} and state in (8, 9)
+ order by insertTime desc limit #{pageNum}, #{size}
</select>
<select id="queryMyTripListAll" resultType="map">
select
--
Gitblit v1.7.1