From 71a68f675e319967c3078f3f2b86ee971b47b50b Mon Sep 17 00:00:00 2001
From: zhibing.pu <393733352@qq.com>
Date: 星期一, 02 九月 2024 13:34:26 +0800
Subject: [PATCH] 修改bug和翻译
---
UserIGOTravel/guns-admin/src/main/java/com/stylefeng/guns/modular/smallLogistics/dao/mapping/OrderLogisticsMapper.xml | 16 ++++++++--------
1 files changed, 8 insertions(+), 8 deletions(-)
diff --git a/UserIGOTravel/guns-admin/src/main/java/com/stylefeng/guns/modular/smallLogistics/dao/mapping/OrderLogisticsMapper.xml b/UserIGOTravel/guns-admin/src/main/java/com/stylefeng/guns/modular/smallLogistics/dao/mapping/OrderLogisticsMapper.xml
index f32ab2b..bbf39a1 100644
--- a/UserIGOTravel/guns-admin/src/main/java/com/stylefeng/guns/modular/smallLogistics/dao/mapping/OrderLogisticsMapper.xml
+++ b/UserIGOTravel/guns-admin/src/main/java/com/stylefeng/guns/modular/smallLogistics/dao/mapping/OrderLogisticsMapper.xml
@@ -162,7 +162,8 @@
(select price from t_order_logistics_spread where orderLogisticsId = a.id) as differenceMoney,
cancelMidway,
tripId,
- remark
+ remark,
+ companyId
from t_order_logistics as a where userId = #{uid} and isDelete = 1 order by insertTime desc limit #{pageNum}, #{size}
</select>
@@ -269,12 +270,10 @@
c.carColor as carColor,
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_logistics where driverId = a.driverId and state in (6, 9))
- ) as orderNum,
+ (
+ (select count(id) from t_order_private_car where driverId = a.driverId and state in (6, 7, 8, 9)) +
+ (select count(id) from t_order_logistics where driverId = a.driverId and state in (6, 7, 8, 9))
+ ) as orderNum,
b.phone as driverPhone,
if(a.state = 10, (select money from t_order_cancel where orderId = a.id and orderType = a.type 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 = a.type and state = 2 order by insertTime desc limit 0, 1), 0)) as cancelPayMoney,
if(a.state = 10, (select id from t_order_cancel where orderId = a.id and orderType = a.type and state = 1 order by insertTime desc limit 0, 1), 0) as cancelId,
@@ -286,7 +285,8 @@
h.reason as cancelReason,
h.remark as cancelRemark,
a.tripId,
- a.snatchOrderTime
+ a.snatchOrderTime,
+ a.startDuration
from t_order_logistics a
left join t_driver b on (a.driverId = b.id)
left join t_car c on (a.carId = c.id)
--
Gitblit v1.7.1