From f23aefde744ae68ab28bfa8ac0e98ccc705b6067 Mon Sep 17 00:00:00 2001
From: dzc <2388224167@qq.com>
Date: Thu, 27 Mar 2025 19:06:01 +0800
Subject: [PATCH] 11

---
 .../main/resources/mapper/order/HardOrderMapper.xml  | 12 +++---------
 1 file changed, 3 insertions(+), 9 deletions(-)

diff --git a/pjcloud-hardware/pjcloud-hardware-biz/src/main/resources/mapper/order/HardOrderMapper.xml b/pjcloud-hardware/pjcloud-hardware-biz/src/main/resources/mapper/order/HardOrderMapper.xml
index 3b0829aa9..fa18be4ac 100644
--- a/pjcloud-hardware/pjcloud-hardware-biz/src/main/resources/mapper/order/HardOrderMapper.xml
+++ b/pjcloud-hardware/pjcloud-hardware-biz/src/main/resources/mapper/order/HardOrderMapper.xml
@@ -153,9 +153,9 @@
                 #{v}
             </foreach>
         </if>
-        <if test="dto.orderPayTypeCodes != null and dto.orderPayTypeCodes.size() != 0">
-            and a.pay_type in
-            <foreach collection="dto.orderPayTypeCodes" item="v" open="(" close=")" separator=",">
+        <if test="dto.mchTypeCodes != null and dto.mchTypeCodes.size() != 0">
+            and a.merchant_type in
+            <foreach collection="dto.mchTypeCodes" item="v" open="(" close=")" separator=",">
                 #{v}
             </foreach>
         </if>
@@ -185,12 +185,6 @@
                     #{v}
                 </foreach>
             </if>
-            <if test="dto.mchTypeCodes != null and dto.mchTypeCodes.size() != 0">
-                and a.merchant_type in
-                <foreach collection="dto.mchTypeCodes" item="v" open="(" close=")" separator=",">
-                    #{v}
-                </foreach>
-            </if>
         </where>
         order by a.create_time desc, a.user_id desc
     </select>