From 085d0e9e62e524b7cf0e7b7d8ad3b51a5a7c1e81 Mon Sep 17 00:00:00 2001
From: 无关风月 <443237572@qq.com>
Date: 星期三, 24 七月 2024 11:01:09 +0800
Subject: [PATCH] Merge branch '2.0' of http://120.76.84.145:10101/gitblit/r/java/IgoTravel into 2.0
---
UserIGOTravel/guns-admin/src/main/java/com/stylefeng/guns/modular/smallLogistics/dao/mapping/OrderLogisticsMapper.xml | 57 +++++++++++++++++++++++++++++++++++++++++++++------------
1 files changed, 45 insertions(+), 12 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 12e74ba..2e6eabe 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
@@ -128,7 +128,8 @@
trackId as trackId,
isDelete as isDelete,
telX as telX,
- bindId as bindId
+ bindId as bindId,
+ tripId
from t_order_logistics where isDelete = 1
<if test="null != start and null != end">
and insertTime between #{start} and #{end}
@@ -151,14 +152,17 @@
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, 'Common goods', 'valuables'), if(cargoType = 1, 'Les articles ordinaires', '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,
- (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}
+ ifnull(discountMoney, 0) as discountMoney,
+ (select price from t_order_logistics_spread where orderLogisticsId = a.id) as differenceMoney,
+ cancelMidway,
+ tripId
+ from t_order_logistics as a where userId = #{uid} and isDelete = 1 order by insertTime desc limit #{pageNum}, #{size}
</select>
@@ -169,7 +173,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 +184,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>
@@ -235,12 +239,29 @@
a.endLat as endLat,
a.endAddress as endAddress,
a.driverId as driverId,
- a.orderMoney as orderMoney,
- a.redPacketMoney as redPacketMoney,
- a.couponMoney as couponMoney,
- a.discountMoney as discountMoney,
- a.payMoney as payMoney,
+ a.orderMoney as orderMoney,
+ a.startMileage as startMileage,
+ a.mileage as mileage,
+ a.startMoney as startMoney,
+ a.mileageKilometers as mileageKilometers,
+ a.mileageMoney as mileageMoney,
+ a.duration as duration,
+ a.durationMoney as durationMoney,
+ a.wait as wait,
+ a.waitMoney as waitMoney,
+ a.longDistance as longDistance,
+ a.longDistanceMoney as longDistanceMoney,
+ a.parkMoney as parkMoney,
+ a.roadTollMoney as roadTollMoney,
+ a.redPacketMoney as redPacketMoney,
+ a.couponMoney as couponMoney,
+ a.discount as discount,
+ a.discountMoney as discountMoney,
+ a.priceDifference,
+ a.payType,
+ a.payMoney as payMoney,
a.remark as remark,
+ a.companyId,
b.headImgUrl as driverAvatar,
CONCAT(b.firstName, " ", b.lastName) as driverName,
c.carLicensePlate as licensePlate,
@@ -262,7 +283,9 @@
h.userType as cancelUserType,
h.money as cancelMoney,
h.reason as cancelReason,
- h.remark as cancelRemark
+ h.remark as cancelRemark,
+ a.tripId,
+ a.snatchOrderTime
from t_order_logistics a
left join t_driver b on (a.driverId = b.id)
left join t_car c on (a.carId = c.id)
@@ -272,4 +295,14 @@
left join t_order_cancel h on (a.id = h.orderId and h.orderType = a.type and h.state = 2)
where a.id = #{orderId}
</select>
+
+
+ <select id="queryRedEnvelope" resultType="map">
+ select
+ redPacketMoney as money,
+ DATE_FORMAT(insertTime, '%Y-%m-%d %H:%i') as time,
+ ('包裹') as name,
+ UNIX_TIMESTAMP(insertTime) as insertTime
+ from t_order_logistics where userId = #{uid} and state in (8, 9) and redPacketId is not null
+ </select>
</mapper>
\ No newline at end of file
--
Gitblit v1.7.1