From 1e4181e2131350b15fd5538532331e333631c64f Mon Sep 17 00:00:00 2001
From: puzhibing <393733352@qq.com>
Date: 星期四, 20 七月 2023 18:00:54 +0800
Subject: [PATCH] 更新接口
---
DriverIGOTravel/guns-admin/src/main/java/com/stylefeng/guns/modular/specialTrain/dao/mapping/OrderPrivateCarMapper.xml | 15 ++++++++-------
1 files changed, 8 insertions(+), 7 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 a1b69f2..4a82b0d 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 , 'Private car order', 'Commande de voiture exclusive')) 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 , 'Private car order', 'Commande de voiture exclusive')) 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 , 'Private car order', 'Commande de voiture exclusive')) 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 , 'Private car order', 'Commande de voiture exclusive')) as `name`,
DATE_FORMAT(travelTime, '%Y-%m-%d %H:%i:%s') as time,
startAddress as startAddress,
endAddress as endAddress,
@@ -188,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 , 'Private car order', 'Commande de voiture exclusive')) as orderName,
+ DATE_FORMAT(travelTime, '%m-%d %H:%i') as travelTime,
startAddress as startAddress,
endAddress as endAddress,
startLon as startLon,
@@ -213,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,
@@ -224,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,
--
Gitblit v1.7.1