From 26079aa3c34f47e952a9538a93d6f8a3bab9a0fc Mon Sep 17 00:00:00 2001 From: 无关风月 <443237572@qq.com> Date: 星期五, 23 八月 2024 09:12:44 +0800 Subject: [PATCH] Merge branch '2.0' of http://120.76.84.145:10101/gitblit/r/java/IgoTravel into 2.0 --- UserIGOTravel/guns-admin/src/main/java/com/stylefeng/guns/modular/smallLogistics/dao/mapping/OrderLogisticsMapper.xml | 10 ++++------ 1 files changed, 4 insertions(+), 6 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 21c2778..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 @@ -270,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, -- Gitblit v1.7.1