From 902be1a7821662543ec9df05d41ee065f180d994 Mon Sep 17 00:00:00 2001
From: zhibing.pu <393733352@qq.com>
Date: 星期日, 28 四月 2024 16:49:58 +0800
Subject: [PATCH] 新增加功能

---
 DriverIGOTravel/guns-admin/src/main/java/com/stylefeng/guns/modular/smallLogistics/dao/mapping/OrderLogisticsMapper.xml |    7 +++++--
 1 files changed, 5 insertions(+), 2 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 755ad1d..c543525 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
@@ -119,6 +119,7 @@
         a.payMoney as payMoney,
         a.trackId as trackId,
 		b.nickName as userName,
+        b.phone as userPhone,
         a.recipient as nickName,
         a.recipientPhone as phone,
 		a.urgent as urgent,
@@ -134,7 +135,8 @@
         (select isSpecialCar from t_sys_reformist where companyId = a.companyId) as reassign,
         a.driverPay,
         a.isFrozen,
-        a.priceDifference
+        a.priceDifference,
+        DATE_FORMAT(a.snatchOrderTime, '%Y-%m-%d %H:%i:%s') as snatchOrderTime
         from t_order_logistics a
         left join t_user b on (a.userId = b.id)
         left join t_order_cancel c on (a.id = c.orderId and c.orderType = a.type and c.state = 2)
@@ -178,7 +180,8 @@
         payManner as payManner,
         UNIX_TIMESTAMP(travelTime) as travelTime,
         remark as remark,
-        driverPay
+        driverPay,
+        cancelMidway
         from t_order_logistics where driverId = #{uid}
         <if test="state == 1">
             and state not in (1, 7)

--
Gitblit v1.7.1