From 73b750200f25df08aa64124da49e7461f9de6653 Mon Sep 17 00:00:00 2001
From: Pu Zhibing <393733352@qq.com>
Date: 星期五, 13 十二月 2024 15:09:49 +0800
Subject: [PATCH] Merge branch 'master' of http://120.76.84.145:10101/gitblit/r/java/NTTravel

---
 DriverNTTravel/guns-admin/src/main/java/com/stylefeng/guns/modular/system/dao/mapping/TOrderTransferMapper.xml |   30 +++++++++++++++++++++++++++++-
 1 files changed, 29 insertions(+), 1 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..be34b07 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
@@ -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