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/specialTrain/dao/mapping/OrderPrivateCarMapper.xml | 16 +++++++---------
1 files changed, 7 insertions(+), 9 deletions(-)
diff --git a/UserIGOTravel/guns-admin/src/main/java/com/stylefeng/guns/modular/specialTrain/dao/mapping/OrderPrivateCarMapper.xml b/UserIGOTravel/guns-admin/src/main/java/com/stylefeng/guns/modular/specialTrain/dao/mapping/OrderPrivateCarMapper.xml
index 3feb865..5bf3916 100644
--- a/UserIGOTravel/guns-admin/src/main/java/com/stylefeng/guns/modular/specialTrain/dao/mapping/OrderPrivateCarMapper.xml
+++ b/UserIGOTravel/guns-admin/src/main/java/com/stylefeng/guns/modular/specialTrain/dao/mapping/OrderPrivateCarMapper.xml
@@ -360,7 +360,7 @@
startAddress as startAddress,
endAddress as endAddress,
payMoney as payMoney,
- ('打车订单') as orderName,
+ ('打车') as orderName,
if(invoiceId is null, 1, 2) as invoice,
unix_timestamp(insertTime) as insertTime,
(1) as orderType
@@ -429,12 +429,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 = 12, (select money from t_order_cancel where orderId = a.id and orderType = 1 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 = 1 and state = 2 order by insertTime desc limit 0, 1), 0)) as cancelPayMoney,
if(a.state = 12, (select id from t_order_cancel where orderId = a.id and orderType = 1 and state = 1 order by insertTime desc limit 0, 1), 0) as cancelId,
@@ -468,7 +466,7 @@
select
(payMoney * -1) as money,
DATE_FORMAT(insertTime, '%Y-%m-%d %H:%i') as time,
- ('打车订单') as name,
+ ('打车') as name,
UNIX_TIMESTAMP(insertTime) as insertTime
from t_order_private_car where payMoney != 0 and userId = #{uid} and state in (8, 9, 10, 11, 12) and payType = 3
</select>
@@ -478,7 +476,7 @@
select
redPacketMoney as money,
DATE_FORMAT(insertTime, '%Y-%m-%d %H:%i') as time,
- ('打车订单') as name,
+ ('打车') as name,
UNIX_TIMESTAMP(insertTime) as insertTime
from t_order_private_car where userId = #{uid} and state in (8, 9) and redPacketId is not null
</select>
--
Gitblit v1.7.1