From 085d0e9e62e524b7cf0e7b7d8ad3b51a5a7c1e81 Mon Sep 17 00:00:00 2001
From: 无关风月 <443237572@qq.com>
Date: 星期三, 24 七月 2024 11:01:09 +0800
Subject: [PATCH] Merge branch '2.0' of http://120.76.84.145:10101/gitblit/r/java/IgoTravel into 2.0
---
DriverIGOTravel/guns-admin/src/main/java/com/stylefeng/guns/modular/specialTrain/dao/mapping/OrderPrivateCarMapper.xml | 39 +++++++++++++++++++++++++--------------
1 files changed, 25 insertions(+), 14 deletions(-)
diff --git a/DriverIGOTravel/guns-admin/src/main/java/com/stylefeng/guns/modular/specialTrain/dao/mapping/OrderPrivateCarMapper.xml b/DriverIGOTravel/guns-admin/src/main/java/com/stylefeng/guns/modular/specialTrain/dao/mapping/OrderPrivateCarMapper.xml
index 4a82b0d..98cedf2 100644
--- a/DriverIGOTravel/guns-admin/src/main/java/com/stylefeng/guns/modular/specialTrain/dao/mapping/OrderPrivateCarMapper.xml
+++ b/DriverIGOTravel/guns-admin/src/main/java/com/stylefeng/guns/modular/specialTrain/dao/mapping/OrderPrivateCarMapper.xml
@@ -98,13 +98,14 @@
select
id as id,
(1) as type,
- if(#{language} = 1, '专车订单', if(#{language} = 2 , 'Private car order', 'Commande de voiture exclusive')) as `name`,
+ if(#{language} = 1, '打车', if(#{language} = 2 , 'Ride', 'Course')) as `name`,
DATE_FORMAT(travelTime, '%Y-%m-%d %H:%i:%s') as time,
startAddress as startAddress,
endAddress as endAddress,
state as state,
orderType as reservation,
- driverId as driverId
+ driverId as driverId,
+ isFrozen
from t_order_private_car where 1 = 1
<if test="null != driverId">
and driverId = #{driverId}
@@ -116,13 +117,14 @@
select
id as id,
(1) as type,
- if(#{language} = 1, '专车订单', if(#{language} = 2 , 'Private car order', 'Commande de voiture exclusive')) as `name`,
+ if(#{language} = 1, '打车', if(#{language} = 2 , 'Ride', 'Course')) as `name`,
DATE_FORMAT(travelTime, '%Y-%m-%d %H:%i:%s') as time,
startAddress as startAddress,
endAddress as endAddress,
state as state,
orderType as reservation,
- driverId as driverId
+ driverId as driverId,
+ isFrozen
from t_order_private_car where 1 = 1
<if test="null != driverId">
and driverId = #{driverId}
@@ -133,13 +135,14 @@
select
id as id,
(1) as type,
- if(#{language} = 1, '专车订单', if(#{language} = 2 , 'Private car order', 'Commande de voiture exclusive')) as `name`,
+ if(#{language} = 1, '打车', if(#{language} = 2 , 'Ride', 'Course')) as `name`,
DATE_FORMAT(travelTime, '%Y-%m-%d %H:%i:%s') as time,
startAddress as startAddress,
endAddress as endAddress,
state as state,
orderType as reservation,
- driverId as driverId
+ driverId as driverId,
+ isFrozen
from t_order_private_car where 1 = 1
<if test="null != driverId">
and driverId = #{driverId}
@@ -155,7 +158,7 @@
select
id as id,
(1) as type,
- if(#{language} = 1, '专车订单', if(#{language} = 2 , 'Private car order', 'Commande de voiture exclusive')) as `name`,
+ if(#{language} = 1, '打车', if(#{language} = 2 , 'Ride', 'Course')) as `name`,
DATE_FORMAT(travelTime, '%Y-%m-%d %H:%i:%s') as time,
startAddress as startAddress,
endAddress as endAddress,
@@ -165,13 +168,16 @@
payManner as payManner,
UNIX_TIMESTAMP(travelTime) as travelTime,
remark as remark,
- driverPay
- from t_order_private_car where driverId = #{driverId}
+ driverPay,
+ cancelMidway,
+ as settleAccounts
+ from t_order_private_car
+ where driverId = #{driverId}
<if test="state == 1">
and state != 1
</if>
<if test="state == 2">
- and state = 7
+ and (state in (7, 12) or driverPay = 1)
</if>
<if test="state == 3">
and state = 10
@@ -188,7 +194,7 @@
select
id as orderId,
state as orderState,
- if(#{language} = 1, '专车订单', if(#{language} = 2 , 'Private car order', 'Commande de voiture exclusive')) as orderName,
+ if(#{language} = 1, '打车', if(#{language} = 2 , 'Ride', 'Course')) as orderName,
DATE_FORMAT(travelTime, '%m-%d %H:%i') as travelTime,
startAddress as startAddress,
endAddress as endAddress,
@@ -201,7 +207,8 @@
orderSource as orderSource,
orderType as orderType,
isReassign as isReassign,
- companyId as companyId
+ companyId as companyId,
+ tripId
from t_order_private_car where id = #{orderId}
</select>
@@ -227,6 +234,7 @@
a.payMoney as payMoney,
a.trackId as trackId,
b.nickName as nickName,
+ b.phone as userPhone,
a.passengersPhone as phone,
a.orderType as reservation,
a.telX as telX,
@@ -241,9 +249,12 @@
c.reason as cancelReason,
c.remark as cancelRemark,
c.money as cancelPayMoney,
- if(c.userType = 1, '用户取消', '平台取消') as cancelUser,
+ if(c.userType = 1, '用户', '平台') as cancelUser,
(select isSpecialCar from t_sys_reformist where companyId = a.companyId) as reassign,
- a.driverPay
+ a.driverPay,
+ a.isFrozen,
+ a.tripId,
+ DATE_FORMAT(a.snatchOrderTime, '%Y-%m-%d %H:%i:%s') as snatchOrderTime
from t_order_private_car a
left join t_user b on (a.userId = b.id)
left join t_order_cancel c on (a.id = c.orderId and c.orderType = 1 and c.state = 2)
--
Gitblit v1.7.1