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/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 f5e2eec..628617c 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,8 +75,8 @@
select
a.id as id,
a.state as orderState,
- if(#{language} = 1, '市内小件物流订单', if(#{language} = 2, 'Small parts logistics orders in the city', 'Commandes logistiques de petites pièces dans la ville')) as orderName,
- DATE_FORMAT(a.travelTime, '%m月%d日 %H:%i') as travelTime,
+ 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,
a.startLon as startLon,
@@ -144,7 +144,7 @@
select
id as id,
type as type,
- if(#{language} = 1, '市内小件物流订单', if(#{language} = 2, 'Small parts logistics orders in the city', 'Commandes logistiques de petites pièces dans la ville')) 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, 'Small parts logistics orders in the city', 'Commandes logistiques de petites pièces dans la ville')) 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