From 387f61d55a8e20bc772b026cba4f8c34dfce5665 Mon Sep 17 00:00:00 2001
From: puzhibing <393733352@qq.com>
Date: 星期三, 07 二月 2024 11:20:28 +0800
Subject: [PATCH] 更新代码
---
UserIGOTravel/guns-admin/src/main/java/com/stylefeng/guns/modular/smallLogistics/dao/mapping/OrderLogisticsMapper.xml | 12 ++++++------
1 files changed, 6 insertions(+), 6 deletions(-)
diff --git a/UserIGOTravel/guns-admin/src/main/java/com/stylefeng/guns/modular/smallLogistics/dao/mapping/OrderLogisticsMapper.xml b/UserIGOTravel/guns-admin/src/main/java/com/stylefeng/guns/modular/smallLogistics/dao/mapping/OrderLogisticsMapper.xml
index 106c7ee..31b1191 100644
--- a/UserIGOTravel/guns-admin/src/main/java/com/stylefeng/guns/modular/smallLogistics/dao/mapping/OrderLogisticsMapper.xml
+++ b/UserIGOTravel/guns-admin/src/main/java/com/stylefeng/guns/modular/smallLogistics/dao/mapping/OrderLogisticsMapper.xml
@@ -151,14 +151,14 @@
DATE_FORMAT(travelTime, '%Y-%m-%d %H:%i') as time,
endAddress as endAddress,
startAddress as startAddress,
- CONCAT((if(cargoType = 1, '普通小件', '贵重物品')), 'X', cargoNumber) as cargoType,
+ CONCAT(if(#{language} = 1, if(cargoType = 1, '包裹', '贵重物品'), if(#{language} = 2, if(cargoType = 1, 'Package', 'valuables'), if(cargoType = 1, 'Colis', 'Objets de valeur'))), 'X', cargoNumber) as cargoType,
driverId as driverId,
`type` as orderType,
state as state,
orderMoney as orderMoney,
payMoney as payMoney,
(select price from t_order_logistics_spread where orderLogisticsId = a.id) as differenceMoney
- from t_order_logistics as a where userId = #{uid} order by insertTime desc limit #{pageNum}, #{size}
+ from t_order_logistics as a where userId = #{uid} and isDelete = 1 order by insertTime desc limit #{pageNum}, #{size}
</select>
@@ -167,7 +167,7 @@
select
(payMoney * -1) as money,
DATE_FORMAT(insertTime, '%Y-%m-%d %H:%i') as time,
- if(type = 4, '同城小件物流订单', '跨城小件物流') as name,
+ if(type = 4, '包裹订单', '跨城小件物流') as name,
UNIX_TIMESTAMP(insertTime) as insertTime
from t_order_logistics where payMoney != 0 and userId = #{uid} and state not in (7, 10)
@@ -176,7 +176,7 @@
select
(a.payMoney * -1) as money,
DATE_FORMAT(a.payTime, '%Y-%m-%d %H:%i') as time,
- if(b.type = 4, '同城小件物流订单', '跨城小件物流') as name,
+ if(b.type = 4, '包裹订单', '跨城小件物流') as name,
UNIX_TIMESTAMP(a.payTime) as insertTime
from t_order_logistics_spread a
left join t_order_logistics b on (a.orderLogisticsId = b.id)
@@ -193,7 +193,7 @@
startAddress as startAddress,
endAddress as endAddress,
payMoney as payMoney,
- if(type = 4, '同城小件物流订单', '跨城小件物流订单') as orderName,
+ if(type = 4, '包裹流订单', '跨城小件物流订单') as orderName,
if(invoiceId is null, 1, 2) as invoice,
unix_timestamp(insertTime) as insertTime,
`type` as orderType
@@ -225,7 +225,7 @@
a.state as state,
a.oldState as oldState,
DATE_FORMAT(a.insertTime, '%Y-%m-%d %H:%i:%s') as insertTime,
- DATE_FORMAT(a.travelTime, '%m月%d日 %H:%i') as travelTime,
+ DATE_FORMAT(a.travelTime, '%m-%d %H:%i') as travelTime,
DATE_FORMAT(a.arriveTime, '%Y-%m-%d %H:%i:%s') as arriveTime,
DATE_FORMAT(a.travelTime, '%Y-%m-%d %H:%i:%s') as travelTime1,
a.startLon as startLon,
--
Gitblit v1.7.1