From 01fb3942136929b10d1fd704330f9d400b38bfb0 Mon Sep 17 00:00:00 2001
From: Pu Zhibing <393733352@qq.com>
Date: 星期四, 23 十月 2025 18:09:19 +0800
Subject: [PATCH] 修改bug
---
UserQYTTravel/guns-admin/src/main/java/com/stylefeng/guns/modular/crossCity/dao/mapping/OrderCrossCityMapper.xml | 14 ++++++++------
1 files changed, 8 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 e3a9e73..0850600 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
@@ -320,7 +320,7 @@
a.driverId as driverId,
a.peopleNumber as peopleNumber,
a.seatNumber as seatNumber,
- a.orderMoney as orderMoney,
+ if(a.abnormal = 2 and a.abnormalStatus = 2, a.responsibilityMoney, a.orderMoney) as orderMoney,
a.redPacketMoney as redPacketMoney,
a.couponMoney as couponMoney,
a.discountMoney as discountMoney,
@@ -355,7 +355,9 @@
a.abnormalRemark as abnormalRemark,
a.abnormalIntro as abnormalIntro,
a.abnormalImg as abnormalImg,
- a.companyId as companyId
+ a.companyId as companyId,
+ a.travelMode,
+ 0 as appealButton
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)
@@ -618,7 +620,7 @@
select
id as orderId,
DATE_FORMAT(insertTime, '%Y-%m-%d %H:%i') as orderTime,
- DATE_FORMAT(travelTime, '%m月?d日?%H:%i') as time,
+ DATE_FORMAT(travelTime, '%m月?d日 %H:%i') as time,
startAddress as startAddress,
endAddress as endAddress,
driverId as driverId,
@@ -634,14 +636,14 @@
boardingTime,
boardingLon,
boardingLat
- from t_order_cross_city where userId = #{uid} order by insertTime desc limit #{pageNum}, #{size}
+ 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,
+ DATE_FORMAT(travelTime, '%m月?d日 %H:%i') as time,
startAddress as startAddress,
endAddress as endAddress,
driverId as driverId,
@@ -657,6 +659,6 @@
boardingTime,
boardingLon,
boardingLat
- from t_order_cross_city where userId = #{uid} order by insertTime desc
+ 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