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 | 12 ++++++------
1 files changed, 6 insertions(+), 6 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..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,
- 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,
@@ -116,7 +116,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,
@@ -133,7 +133,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,
@@ -155,7 +155,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,
@@ -171,7 +171,7 @@
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 +188,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,
--
Gitblit v1.7.1