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 | 36 ++++++++++++++++++++++++++++--------
1 files changed, 28 insertions(+), 8 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 9854eb3..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}
@@ -159,7 +160,8 @@
payMoney as payMoney,
ifnull(discountMoney, 0) as discountMoney,
(select price from t_order_logistics_spread where orderLogisticsId = a.id) as differenceMoney,
- cancelMidway
+ cancelMidway,
+ tripId
from t_order_logistics as a where userId = #{uid} and isDelete = 1 order by insertTime desc limit #{pageNum}, #{size}
</select>
@@ -237,11 +239,27 @@
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,
@@ -265,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)
--
Gitblit v1.7.1