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/specialTrain/dao/mapping/OrderPrivateCarMapper.xml | 48 ++++++++++++++++++++++++++++++++++++++++++++++++ 1 files changed, 48 insertions(+), 0 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 6bd4523..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 @@ -581,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