From 21ee0e811348793da746bc9e6ebe2ec226da2a8a Mon Sep 17 00:00:00 2001
From: Pu Zhibing <393733352@qq.com>
Date: 星期四, 16 十月 2025 17:37:18 +0800
Subject: [PATCH] 修改bug
---
UserQYTTravel/guns-admin/src/main/java/com/stylefeng/guns/modular/specialTrain/dao/mapping/OrderPrivateCarMapper.xml | 57 ++++++++++++++++++++++++++++++++++++++++++++++++++++++---
1 files changed, 54 insertions(+), 3 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 25a9a3a..1977a90 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>
@@ -336,7 +336,7 @@
a.endLat as endLat,
a.endAddress as endAddress,
a.driverId as driverId,
- a.orderMoney as orderMoney,
+ if(a.abnormal = 2 and a.abnormalStatus = 2, a.responsibilityMoney, a.orderMoney) as orderMoney,
a.startMileage as startMileage,
a.startMoney as startMoney,
a.mileageKilometers as mileageKilometers,
@@ -390,7 +390,9 @@
a.abnormalStatus,
a.abnormalRemark,
a.abnormalIntro,
- a.abnormalImg
+ a.abnormalImg,
+ a.companyId,
+ IF((a.abnormalIntro is null and a.recoveryOrder = 1) or (a.state in (8, 9) and null = a.abnormal), 0, 1) as appealButton
from t_order_private_car a
left join t_driver b on (a.driverId = b.id)
left join t_car c on (a.carId = c.id)
@@ -580,4 +582,53 @@
</if>
</select>
+
+
+ <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,
+ startAddress as startAddress,
+ endAddress as endAddress,
+ driverId as driverId,
+ (1) as orderType,
+ state as state,
+ oldState as oldState,
+ thankYouFee,
+ passengersPhone,
+ payMoney,
+ endServiceTime,
+ companyId,
+ arriveTime,
+ boardingTime,
+ boardingLon,
+ boardingLat
+ 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
+ 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,
+ (1) as orderType,
+ state as state,
+ oldState as oldState,
+ thankYouFee,
+ passengersPhone,
+ payMoney,
+ endServiceTime,
+ companyId,
+ arriveTime,
+ boardingTime,
+ boardingLon,
+ boardingLat
+ from t_order_private_car where userId = #{uid} and state in (8, 9) order by insertTime desc
+ </select>
</mapper>
\ No newline at end of file
--
Gitblit v1.7.1