From 16a814568d4ffdfd41ee8101abd93ed9b3ccfd64 Mon Sep 17 00:00:00 2001
From: wangw <1594593906@qq.com>
Date: Fri, 9 Jan 2026 16:15:04 +0800
Subject: [PATCH] =?UTF-8?q?where=20=E6=A0=87=E7=AD=BE?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit
---
.../mapper/ShopDirectMerchantMapper.xml | 27 ++++++++++---------
1 file changed, 14 insertions(+), 13 deletions(-)
diff --git a/cash-service/order-service/src/main/resources/mapper/ShopDirectMerchantMapper.xml b/cash-service/order-service/src/main/resources/mapper/ShopDirectMerchantMapper.xml
index 73c34a7cf..8725a4795 100644
--- a/cash-service/order-service/src/main/resources/mapper/ShopDirectMerchantMapper.xml
+++ b/cash-service/order-service/src/main/resources/mapper/ShopDirectMerchantMapper.xml
@@ -8,18 +8,19 @@
select merchant.*,shop.shop_name as shopName
from tb_shop_direct_merchant merchant
left join tb_shop_info shop on merchant.shop_id = shop.id
- where
-
- and merchant.user_type = #{queryParam.userType}
-
-
- and shop.shop_name like concat('%',#{queryParam.shopName},'%')
-
-
- and (merchant.wechat_status = #{queryParam.status} or merchant.alipay_status = #{queryParam.status})
-
-
- and merchant.alipay_account like concat('%',#{queryParam.alipayAccount},'%')
-
+
+
+ and merchant.user_type = #{queryParam.userType}
+
+
+ and shop.shop_name like concat('%',#{queryParam.shopName},'%')
+
+
+ and (merchant.wechat_status = #{queryParam.status} or merchant.alipay_status = #{queryParam.status})
+
+
+ and merchant.alipay_account like concat('%',#{queryParam.alipayAccount},'%')
+
+