From 722db9e28a0c8e33d79621c66c0ecf1d60fcf0f6 Mon Sep 17 00:00:00 2001
From: luodangjia <luodangjia>
Date: 星期三, 17 七月 2024 09:55:11 +0800
Subject: [PATCH] 7.17
---
DriverIGOTravel/guns-admin/src/main/java/com/stylefeng/guns/modular/smallLogistics/dao/mapping/OrderLogisticsMapper.xml | 10 +++++-----
1 files changed, 5 insertions(+), 5 deletions(-)
diff --git a/DriverIGOTravel/guns-admin/src/main/java/com/stylefeng/guns/modular/smallLogistics/dao/mapping/OrderLogisticsMapper.xml b/DriverIGOTravel/guns-admin/src/main/java/com/stylefeng/guns/modular/smallLogistics/dao/mapping/OrderLogisticsMapper.xml
index 30dea3b..f8d6860 100644
--- a/DriverIGOTravel/guns-admin/src/main/java/com/stylefeng/guns/modular/smallLogistics/dao/mapping/OrderLogisticsMapper.xml
+++ b/DriverIGOTravel/guns-admin/src/main/java/com/stylefeng/guns/modular/smallLogistics/dao/mapping/OrderLogisticsMapper.xml
@@ -75,7 +75,7 @@
select
a.id as id,
a.state as orderState,
- if(#{language} = 1, '包裹', if(#{language} = 2, 'Package', 'Livraison')) as orderName,
+ if(#{language} = 1, '包裹', if(#{language} = 2, 'Delivery', 'Livraison')) as orderName,
DATE_FORMAT(a.travelTime, '%m-%d %H:%i') as travelTime,
a.startAddress as startAddress,
a.endAddress as endAddress,
@@ -130,7 +130,7 @@
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
from t_order_logistics a
@@ -144,7 +144,7 @@
select
id as id,
type as type,
- if(#{language} = 1, '包裹', if(#{language} = 2, 'Package', 'Livraison')) as `name`,
+ if(#{language} = 1, '包裹', if(#{language} = 2, 'Delivery', 'Livraison')) as `name`,
DATE_FORMAT(travelTime, '%Y-%m-%d %H:%i:%s') as `time`,
startAddress as startAddress,
endAddress as endAddress,
@@ -156,7 +156,7 @@
<if test="null != driverId">
and driverId = #{driverId}
</if>
- and state in (2, 3, 4, 5, 8, 11)
+ and state in (2, 3, 4, 5, 8, 11,12)
</select>
@@ -165,7 +165,7 @@
select
id as id,
type as type,
- if(#{language} = 1, '包裹', if(#{language} = 2, 'Package', 'Livraison')) as `name`,
+ if(#{language} = 1, '包裹', if(#{language} = 2, 'Delivery', 'Livraison')) as `name`,
DATE_FORMAT(travelTime, '%Y-%m-%d %H:%i:%s') as time,
startAddress as startAddress,
endAddress as endAddress,
--
Gitblit v1.7.1