From db7fa6a91b9534ac90e219b6f554c54c43c83a5a Mon Sep 17 00:00:00 2001
From: liujie <liujie>
Date: 星期三, 16 八月 2023 09:28:15 +0800
Subject: [PATCH] update

---
 management/guns-admin/src/main/java/com/stylefeng/guns/modular/system/dao/mapping/TCancelOrderMapper.xml |   22 +++++++++++++++++++++-
 1 files changed, 21 insertions(+), 1 deletions(-)

diff --git a/management/guns-admin/src/main/java/com/stylefeng/guns/modular/system/dao/mapping/TCancelOrderMapper.xml b/management/guns-admin/src/main/java/com/stylefeng/guns/modular/system/dao/mapping/TCancelOrderMapper.xml
index 07a3a5a..50230c6 100644
--- a/management/guns-admin/src/main/java/com/stylefeng/guns/modular/system/dao/mapping/TCancelOrderMapper.xml
+++ b/management/guns-admin/src/main/java/com/stylefeng/guns/modular/system/dao/mapping/TCancelOrderMapper.xml
@@ -51,9 +51,29 @@
             <if test="driverName != null and driverName != ''">
                 AND d.name LIKE concat('%',#{driverName},'%')
             </if>
-            AND co.userType = 1
+            <if test="roleType != null and roleType == 2">
+                AND o.branchOfficeId = #{objectId}
+            </if>
+            <if test="roleType != null and roleType == 3">
+                AND o.agentId = #{objectId}
+            </if>
         </where>
         ORDER BY co.createTime
     </select>
+    <select id="userCancelOrderList" resultType="com.stylefeng.guns.modular.system.controller.resp.TOrderResp">
+        select co.createTime,o.code,o.startAddress,o.endAddress
+        from t_cancel_order co
+        left join t_order o  on co.orderId = o.id
+        <where>
+            <if test="userId != null">
+                AND co.userId = #{userId}
+            </if>
+            <if test="orderId != null">
+                AND co.orderId = #{orderId}
+            </if>
+            AND co.userType = 1
+        </where>
+        ORDER BY co.createTime DESC
+    </select>
 
 </mapper>

--
Gitblit v1.7.1