From a3e122e288fcdcb7b65a0d2e5e6b72044a9f7af4 Mon Sep 17 00:00:00 2001
From: liujie <1793218484@qq.com>
Date: 星期三, 13 八月 2025 15:56:54 +0800
Subject: [PATCH] 修改bug

---
 UserQYTTravel/guns-admin/src/main/java/com/stylefeng/guns/modular/specialTrain/dao/mapping/OrderPrivateCarMapper.xml |   56 +++++++++++++++++++++++++++++++++++++++++++++++++++++++-
 1 files changed, 55 insertions(+), 1 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 9166e0f..7e722ca 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
@@ -385,7 +385,13 @@
 		a.waitRule,
 		a.chargeRule,
 		a.chargeRules,
-		a.discountAmount as taxiCardMoney
+		a.discountAmount as taxiCardMoney,
+		a.responsibilityType,
+		a.abnormalStatus,
+		a.abnormalRemark,
+		a.abnormalIntro,
+		a.abnormalImg,
+		a.companyId
         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)
@@ -575,4 +581,52 @@
         </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