From 387f61d55a8e20bc772b026cba4f8c34dfce5665 Mon Sep 17 00:00:00 2001
From: puzhibing <393733352@qq.com>
Date: 星期三, 07 二月 2024 11:20:28 +0800
Subject: [PATCH] 更新代码
---
DriverIGOTravel/guns-admin/src/main/java/com/stylefeng/guns/modular/specialTrain/dao/mapping/OrderPrivateCarMapper.xml | 23 +++++++++++++----------
1 files changed, 13 insertions(+), 10 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 3b8afeb..17bf115 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,7 +98,7 @@
select
id as id,
(1) as type,
- ('专车订单') 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,
@@ -116,7 +116,7 @@
select
id as id,
(1) as type,
- ('专车订单') 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,
@@ -133,7 +133,7 @@
select
id as id,
(1) as type,
- ('专车订单') 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,
@@ -155,7 +155,7 @@
select
id as id,
(1) as type,
- ('专车订单') 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,
@@ -164,13 +164,14 @@
orderMoney as orderMoney,
payManner as payManner,
UNIX_TIMESTAMP(travelTime) as travelTime,
- remark as remark
+ remark as remark,
+ driverPay
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
@@ -187,8 +188,8 @@
select
id as orderId,
state as orderState,
- ('专车订单') as orderName,
- DATE_FORMAT(travelTime, '%m月%d日 %H:%i') as travelTime,
+ 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,
startLon as startLon,
@@ -212,7 +213,7 @@
a.userId as userId,
a.driverId as driverId,
a.state as orderState,
- DATE_FORMAT(a.travelTime, '%m月%d日 %H:%i') as travelTime_,
+ DATE_FORMAT(a.travelTime, '%m-%d %H:%i') as travelTime_,
DATE_FORMAT(a.travelTime, '%Y-%m-%d %H:%i:%s') as travelTime,
DATE_FORMAT(a.arriveTime, '%Y-%m-%d %H:%i:%s') as arriveTime,
a.startAddress as startAddress,
@@ -223,6 +224,7 @@
a.endLat as endLat,
a.orderMoney as orderMoney,
a.payManner as payManner,
+ a.payMoney as payMoney,
a.trackId as trackId,
b.nickName as nickName,
a.passengersPhone as phone,
@@ -240,7 +242,8 @@
c.remark as cancelRemark,
c.money as cancelPayMoney,
if(c.userType = 1, '用户取消', '平台取消') as cancelUser,
- (select isSpecialCar from t_sys_reformist where companyId = a.companyId) as reassign
+ (select isSpecialCar from t_sys_reformist where companyId = a.companyId) as reassign,
+ a.driverPay
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