From 926e065fb0b4424d0d51023c234a92433bac61c8 Mon Sep 17 00:00:00 2001
From: Pu Zhibing <393733352@qq.com>
Date: 星期五, 01 八月 2025 11:53:45 +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/crossCity/dao/mapping/OrderCrossCityMapper.xml | 59 +++++++++++++++++++++++++++++++++++++++++++++++++++++------
1 files changed, 53 insertions(+), 6 deletions(-)
diff --git a/UserQYTTravel/guns-admin/src/main/java/com/stylefeng/guns/modular/crossCity/dao/mapping/OrderCrossCityMapper.xml b/UserQYTTravel/guns-admin/src/main/java/com/stylefeng/guns/modular/crossCity/dao/mapping/OrderCrossCityMapper.xml
index 1c9da11..89bb029 100644
--- a/UserQYTTravel/guns-admin/src/main/java/com/stylefeng/guns/modular/crossCity/dao/mapping/OrderCrossCityMapper.xml
+++ b/UserQYTTravel/guns-admin/src/main/java/com/stylefeng/guns/modular/crossCity/dao/mapping/OrderCrossCityMapper.xml
@@ -350,12 +350,12 @@
CONCAT(j.startTime, '-', j.endTime) as lineShiftTime,
a.holidayFee,
a.discountAmount as taxiCardMoney,
- a.responsibilityType,
- a.abnormalStatus,
- a.abnormalRemark,
- a.abnormalIntro,
- a.abnormalImg,
- a.companyId
+ a.responsibilityType as responsibilityType,
+ a.abnormalStatus as abnormalStatus,
+ a.abnormalRemark as abnormalRemark,
+ a.abnormalIntro as abnormalIntro,
+ a.abnormalImg as abnormalImg,
+ a.companyId as companyId
from t_order_cross_city a
left join t_driver b on (a.driverId = b.id)
left join t_car c on (a.carId = c.id)
@@ -612,4 +612,51 @@
and DATE_FORMAT(a.travelTime, '%Y-%m-%d') = #{day}
</if>
</select>
+
+
+ <select id="queryMyTripList" resultType="map">
+ select
+ id as orderId,
+ 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,
+ (3) as orderType,
+ state as state,
+ oldState as oldState,
+ thankYouFee,
+ passengersPhone,
+ payMoney,
+ endServiceTime,
+ companyId,
+ arriveTime,
+ boardingTime,
+ boardingLon,
+ boardingLat
+ from t_order_cross_city 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,
+ 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,
+ (3) as orderType,
+ state as state,
+ oldState as oldState,
+ thankYouFee,
+ passengersPhone,
+ payMoney,
+ endServiceTime,
+ companyId,
+ arriveTime,
+ boardingTime,
+ boardingLon,
+ boardingLat
+ from t_order_cross_city where userId = #{uid} and state in (8, 9) order by insertTime desc
+ </select>
</mapper>
\ No newline at end of file
--
Gitblit v1.7.1