From 2c68d58198b601f857dd510c82ed83398845fb92 Mon Sep 17 00:00:00 2001
From: =?UTF-8?q?=E9=BD=90=E5=A4=A9=E5=A4=A7=E5=9C=A3?= <17615834396@163.com>
Date: Thu, 31 Oct 2024 10:20:48 +0800
Subject: [PATCH] 1

---
 fuintAdmin/src/api/allOrder.js                |  2 +-
 .../order/mapper/xml/AllOrderInfoMapper.xml   | 19 ++++++++++++++++---
 2 files changed, 17 insertions(+), 4 deletions(-)

diff --git a/fuintAdmin/src/api/allOrder.js b/fuintAdmin/src/api/allOrder.js
index c6ac65cfb..465df14b1 100644
--- a/fuintAdmin/src/api/allOrder.js
+++ b/fuintAdmin/src/api/allOrder.js
@@ -220,7 +220,7 @@ export function getDicts(dictType) {
 export function getStaffByStorId() {
   return request({
     url: '/business/allOrderInfo/getStaffByStorId',
-    method: 'get'
+    method: 'post'
   })
 }
 
diff --git a/fuintBackend/fuint-application/src/main/java/com/fuint/business/order/mapper/xml/AllOrderInfoMapper.xml b/fuintBackend/fuint-application/src/main/java/com/fuint/business/order/mapper/xml/AllOrderInfoMapper.xml
index d9cc8dc8e..70451a707 100644
--- a/fuintBackend/fuint-application/src/main/java/com/fuint/business/order/mapper/xml/AllOrderInfoMapper.xml
+++ b/fuintBackend/fuint-application/src/main/java/com/fuint/business/order/mapper/xml/AllOrderInfoMapper.xml
@@ -870,12 +870,25 @@
         all_order_info ai
         LEFT JOIN mt_user mu ON ai.user_id = mu.id
         LEFT JOIN merchant_config mc on mc.id = ai.m_id
-        <where>
+        where
             <if test="obj.storeId != null and obj.storeId != ''">
                 ai.store_id = #{obj.storeId}
             </if>
-
-        </where>
+            <if test="obj.storeId != null and obj.storeId != ''">
+                and ai.store_id = #{obj.storeId}
+            </if>
+            <if test="obj.orderNo != null and obj.orderNo != ''">
+                and ai.order_no like concat('%', #{obj.orderNo}, '%')
+            </if>
+            <if test="obj.payType != null and obj.payType != ''">
+                and ai.pay_type = #{obj.payType}
+            </if>
+            <if test="obj.type != null and obj.type != ''">
+                and ai.type = #{obj.type}
+            </if>
+            <if test="obj.payChannel != null and obj.payChannel != ''">
+                and ai.pay_channel = #{obj.payChannel}
+            </if>
         ORDER BY ai.create_time DESC
     </select>
     <select id="orderStatistics" resultType="java.util.Map">