From 722db9e28a0c8e33d79621c66c0ecf1d60fcf0f6 Mon Sep 17 00:00:00 2001
From: luodangjia <luodangjia>
Date: 星期三, 17 七月 2024 09:55:11 +0800
Subject: [PATCH] 7.17
---
UserIGOTravel/guns-admin/src/main/java/com/stylefeng/guns/modular/smallLogistics/dao/mapping/OrderLogisticsMapper.xml | 7 ++++---
1 files changed, 4 insertions(+), 3 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 31b1191..1de66f6 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,12 +151,13 @@
DATE_FORMAT(travelTime, '%Y-%m-%d %H:%i') as time,
endAddress as endAddress,
startAddress as startAddress,
- 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,
+ CONCAT(if(#{language} = 1, if(cargoType = 1, '包裹', '贵重物品'), if(#{language} = 2, if(cargoType = 1, 'Package', 'valuables'), if(cargoType = 1, 'Colis', 'Objets de valeur'))), '*', cargoNumber) as cargoType,
driverId as driverId,
`type` as orderType,
state as state,
orderMoney as orderMoney,
payMoney as payMoney,
+ ifnull(discountMoney, 0) as discountMoney,
(select price from t_order_logistics_spread where orderLogisticsId = a.id) as differenceMoney
from t_order_logistics as a where userId = #{uid} and isDelete = 1 order by insertTime desc limit #{pageNum}, #{size}
</select>
@@ -169,7 +170,7 @@
DATE_FORMAT(insertTime, '%Y-%m-%d %H:%i') as time,
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)
+ from t_order_logistics where payMoney != 0 and userId = #{uid} and state not in (7, 10) and payType = 3
union all
@@ -180,7 +181,7 @@
UNIX_TIMESTAMP(a.payTime) as insertTime
from t_order_logistics_spread a
left join t_order_logistics b on (a.orderLogisticsId = b.id)
- where a.payTime is not null and b.userId = #{uid}
+ where a.payTime is not null and b.userId = #{uid} and a.payType = 3
) as aa order by aa.time desc
</select>
--
Gitblit v1.7.1