From 8b09fbc19a96b57bf1d0e4d7c79b51a76aeca554 Mon Sep 17 00:00:00 2001
From: Pu Zhibing <393733352@qq.com>
Date: 星期五, 28 三月 2025 19:57:56 +0800
Subject: [PATCH] 修改bug
---
UserIGOTravel/guns-admin/src/main/java/com/stylefeng/guns/modular/crossCity/dao/mapping/OrderCrossCityMapper.xml | 11 ++++++-----
1 files changed, 6 insertions(+), 5 deletions(-)
diff --git a/UserIGOTravel/guns-admin/src/main/java/com/stylefeng/guns/modular/crossCity/dao/mapping/OrderCrossCityMapper.xml b/UserIGOTravel/guns-admin/src/main/java/com/stylefeng/guns/modular/crossCity/dao/mapping/OrderCrossCityMapper.xml
index da5618c..715ce32 100644
--- a/UserIGOTravel/guns-admin/src/main/java/com/stylefeng/guns/modular/crossCity/dao/mapping/OrderCrossCityMapper.xml
+++ b/UserIGOTravel/guns-admin/src/main/java/com/stylefeng/guns/modular/crossCity/dao/mapping/OrderCrossCityMapper.xml
@@ -302,7 +302,7 @@
a.state as state,
a.oldState as oldState,
DATE_FORMAT(a.insertTime, '%Y-%m-%d %H:%i:%s') as insertTime,
- DATE_FORMAT(a.travelTime, '%m月%d日 %H:%i') as travelTime,
+ DATE_FORMAT(a.travelTime, '%m-%d %H:%i') as travelTime,
DATE_FORMAT(a.arriveTime, '%Y-%m-%d %H:%i:%s') as arriveTime,
DATE_FORMAT(a.travelTime, '%Y-%m-%d %H:%i:%s') as travelTime1,
a.startLon as startLon,
@@ -321,15 +321,16 @@
a.payMoney as payMoney,
a.remark as remark,
b.headImgUrl as driverAvatar,
- b.`name` as driverName,
+ CONCAT(b.firstName, " ", b.lastName) as driverName,
c.carLicensePlate as licensePlate,
c.carColor as carColor,
- CONCAT(f.`name`, d.`name`) as brand,
+ CONCAT(f.`name`, " ", d.`name`) as brand,
((select sum(fraction) from t_order_evaluate where driverId = a.driverId) / (select count(id) from t_order_evaluate where driverId = a.driverId)) as score,
(
(select count(id) from t_order_private_car where driverId = a.driverId and state in (7, 8, 9)) +
(select count(id) from t_order_taxi where driverId = a.driverId and state in (7, 8, 9)) +
- (select count(id) from t_order_cross_city where driverId = a.driverId and state in (6, 8, 9))
+ (select count(id) from t_order_cross_city where driverId = a.driverId and state in (6, 8, 9)) +
+ (select count(id) from t_order_logistics where driverId = a.driverId and state in (6, 9))
) as orderNum,
b.phone as driverPhone,
if(a.state = 12, (select money from t_order_cancel where orderId = a.id and orderType = 3 and state = 1 order by insertTime desc limit 0, 1), if(a.state = 10, (select money from t_order_cancel where orderId = a.id and orderType = 3 and state = 2 order by insertTime desc limit 0, 1), 0)) as cancelPayMoney,
@@ -360,7 +361,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,
--
Gitblit v1.7.1