From 48effdca685a209c19dd2a0ccd456470a895784b Mon Sep 17 00:00:00 2001
From: 无关风月 <443237572@qq.com>
Date: 星期五, 11 十月 2024 18:01:18 +0800
Subject: [PATCH] Merge branch '2.0' of http://120.76.84.145:10101/gitblit/r/java/IgoTravel into 2.0
---
DriverIGOTravel/guns-admin/src/main/java/com/stylefeng/guns/modular/smallLogistics/dao/mapping/OrderLogisticsMapper.xml | 71 ++++++++++++++++++++++++-----------
1 files changed, 48 insertions(+), 23 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 4cee274..88b9159 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
@@ -72,7 +72,13 @@
a.isFrozen,
a.priceDifference,
a.tripId,
- DATE_FORMAT(a.snatchOrderTime, '%Y-%m-%d %H:%i:%s') as snatchOrderTime
+ a.companyId,
+ DATE_FORMAT(a.snatchOrderTime, '%Y-%m-%d %H:%i:%s') as snatchOrderTime,
+ a.cancelMidway,
+ a.remark,
+ DATE_FORMAT(a.estimateArriveTime, '%Y-%m-%d %H:%i:%s') as estimateArriveTime,
+ a.estimateArriveMileage,
+ 1 as orderType
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)
@@ -81,23 +87,44 @@
<select id="queryOrderList" resultType="map">
- select
- id as id,
- type as type,
- if(#{language} = 1, '包裹', if(#{language} = 2, 'Delivery', 'Livraison')) as `name`,
- DATE_FORMAT(travelTime, '%Y-%m-%d %H:%i:%s') as `time`,
- startAddress as startAddress,
- endAddress as endAddress,
- state as state,
- CONCAT(recipient, '-', recipientPhone) as `user`,
- CONCAT(if(#{language} = 1, if(cargoType = 1, '普通货物 x ', '贵重货物 x '), if(#{language} = 2, if(cargoType = 1, 'General cargo x ', 'Valuable cargo x '), if(cargoType = 1, 'Pour marchandises générales x ', 'Marchandises de valeur x '))), cargoNumber) as cargoNumber,
- driverId as driverId,
- isFrozen
- from t_order_logistics where 1 = 1
- <if test="null != driverId">
- and driverId = #{driverId}
+ <if test="1 == state">
+ select
+ id as id,
+ type as type,
+ if(#{language} = 1, '包裹', if(#{language} = 2, 'Delivery', 'Livraison')) as `name`,
+ DATE_FORMAT(travelTime, '%Y-%m-%d %H:%i:%s') as `time`,
+ startAddress as startAddress,
+ endAddress as endAddress,
+ state as state,
+ CONCAT(recipient, '-', recipientPhone) as `user`,
+ CONCAT(if(#{language} = 1, if(cargoType = 1, '普通货物 x ', '贵重货物 x '), if(#{language} = 2, if(cargoType = 1, 'General cargo x ', 'Valuable cargo x '), if(cargoType = 1, 'Pour marchandises générales x ', 'Marchandises de valeur x '))), cargoNumber) as cargoNumber,
+ driverId as driverId,
+ isFrozen
+ from t_order_logistics where 1 = 1
+ <if test="null != driverId">
+ and driverId = #{driverId}
+ </if>
+ and (state in (3, 4, 5, 6, 11) or (state = 2 and (UNIX_TIMESTAMP(travelTime) - UNIX_TIMESTAMP(now())) < 1800))
</if>
- and state in (2, 3, 4, 5, 8, 11,12)
+ <if test="2 == state">
+ select
+ id as id,
+ type as type,
+ if(#{language} = 1, '包裹', if(#{language} = 2, 'Delivery', 'Livraison')) as `name`,
+ DATE_FORMAT(travelTime, '%Y-%m-%d %H:%i:%s') as `time`,
+ startAddress as startAddress,
+ endAddress as endAddress,
+ state as state,
+ CONCAT(recipient, '-', recipientPhone) as `user`,
+ CONCAT(if(#{language} = 1, if(cargoType = 1, '普通货物 x ', '贵重货物 x '), if(#{language} = 2, if(cargoType = 1, 'General cargo x ', 'Valuable cargo x '), if(cargoType = 1, 'Pour marchandises générales x ', 'Marchandises de valeur x '))), cargoNumber) as cargoNumber,
+ driverId as driverId,
+ isFrozen
+ from t_order_logistics where 1 = 1
+ <if test="null != driverId">
+ and driverId = #{driverId}
+ </if>
+ and state = 2 and (UNIX_TIMESTAMP(travelTime) - UNIX_TIMESTAMP(now())) >= 1800
+ </if>
</select>
@@ -118,19 +145,17 @@
UNIX_TIMESTAMP(travelTime) as travelTime,
remark as remark,
driverPay,
- cancelMidway
+ cancelMidway,
+ isFrozen
from t_order_logistics where driverId = #{uid}
- <if test="state == 1">
- and state not in (1, 7)
- </if>
<if test="state == 2">
- and state = 8
+ and state = 7
</if>
<if test="state == 3">
and state = 10
</if>
<if test="state == 4">
- and state in (6, 9)
+ and state in (8, 9)
</if>
order by insertTime desc
</select>
--
Gitblit v1.7.1