From 9d2babb8bb99d55d76eab0558fd9f510652b270c Mon Sep 17 00:00:00 2001
From: luodangjia <luodangjia>
Date: 星期二, 11 六月 2024 15:16:17 +0800
Subject: [PATCH] 6.11
---
DriverNTTravel/guns-admin/src/main/java/com/stylefeng/guns/modular/system/dao/mapping/TOrderTransferMapper.xml | 36 ++++++++++++++++++++++++++++++++----
1 files changed, 32 insertions(+), 4 deletions(-)
diff --git a/DriverNTTravel/guns-admin/src/main/java/com/stylefeng/guns/modular/system/dao/mapping/TOrderTransferMapper.xml b/DriverNTTravel/guns-admin/src/main/java/com/stylefeng/guns/modular/system/dao/mapping/TOrderTransferMapper.xml
index 137654a..4dc3029 100644
--- a/DriverNTTravel/guns-admin/src/main/java/com/stylefeng/guns/modular/system/dao/mapping/TOrderTransferMapper.xml
+++ b/DriverNTTravel/guns-admin/src/main/java/com/stylefeng/guns/modular/system/dao/mapping/TOrderTransferMapper.xml
@@ -167,7 +167,7 @@
<if test="state == 1">
select
id as id,
- (7) as type,
+ (1) as type,
('接送机订单') as `name`,
DATE_FORMAT(travelTime, '%Y-%m-%d %H:%i:%s') as time,
startAddress as startAddress,
@@ -185,7 +185,7 @@
select
id as id,
- (7) as type,
+ (1) as type,
('接送机订单') as `name`,
DATE_FORMAT(travelTime, '%Y-%m-%d %H:%i:%s') as time,
startAddress as startAddress,
@@ -202,7 +202,7 @@
<if test="state == 2">
select
id as id,
- (7) as type,
+ (1) as type,
('接送机订单') as `name`,
DATE_FORMAT(travelTime, '%Y-%m-%d %H:%i:%s') as time,
startAddress as startAddress,
@@ -237,7 +237,35 @@
companyId as companyId
from t_order_transfer where id = #{orderId}
</select>
-
+ <select id="queryMyAllOrder" resultType="map">
+ select
+ id as id,
+ (7) as type,
+ ('接送机订单') as `name`,
+ DATE_FORMAT(travelTime, '%Y-%m-%d %H:%i:%s') as time,
+ startAddress as startAddress,
+ endAddress as endAddress,
+ state as state,
+ orderType as reservation,
+ orderMoney as orderMoney,
+ payManner as payManner,
+ UNIX_TIMESTAMP(travelTime) as travelTime,
+ remark as remark
+ from t_order_transfer where driverId = #{driverId}
+ <if test="state == 1">
+ and state != 1
+ </if>
+ <if test="state == 2">
+ and state = 7
+ </if>
+ <if test="state == 3">
+ and state = 10
+ </if>
+ <if test="state == 4">
+ and state in (6, 7, 8, 9)
+ </if>
+ order by insertTime desc
+ </select>
<select id="queryOrderInfo" resultType="map">
select
--
Gitblit v1.7.1