From a5a7063aa03bdd08fc0aedd22d2c4c1fa1e8ccd1 Mon Sep 17 00:00:00 2001
From: gxwebsoft <Websoft5386339>
Date: Mon, 27 May 2024 18:46:49 +0800
Subject: [PATCH] =?UTF-8?q?=E6=96=B0=E5=A2=9E=E5=AD=97=E6=AE=B5=EF=BC=9Ame?=
 =?UTF-8?q?rchantIds?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

---
 .../com/gxwebsoft/shop/mapper/xml/MerchantMapper.xml | 12 ++++++++++++
 .../java/com/gxwebsoft/shop/param/MerchantParam.java |  9 +++++++++
 2 files changed, 21 insertions(+)

diff --git a/src/main/java/com/gxwebsoft/shop/mapper/xml/MerchantMapper.xml b/src/main/java/com/gxwebsoft/shop/mapper/xml/MerchantMapper.xml
index a79b543..3b04cc7 100644
--- a/src/main/java/com/gxwebsoft/shop/mapper/xml/MerchantMapper.xml
+++ b/src/main/java/com/gxwebsoft/shop/mapper/xml/MerchantMapper.xml
@@ -70,6 +70,18 @@
             <if test="param.createTimeEnd != null">
                 AND a.create_time &lt;= #{param.createTimeEnd}
             </if>
+            <if test="param.merchantIds != null">
+              AND a.merchant_id IN
+              <foreach collection="param.merchantIds" item="item" separator="," open="(" close=")">
+                #{item}
+              </foreach>
+            </if>
+            <if test="param.merchantCodes != null">
+              AND a.merchant_code IN
+              <foreach collection="param.merchantCodes" item="item" separator="," open="(" close=")">
+                #{item}
+              </foreach>
+            </if>
             <if test="param.keywords != null">
               AND (
               a.merchant_name LIKE CONCAT('%', #{param.keywords}, '%')
diff --git a/src/main/java/com/gxwebsoft/shop/param/MerchantParam.java b/src/main/java/com/gxwebsoft/shop/param/MerchantParam.java
index 766ff26..c5ed5bb 100644
--- a/src/main/java/com/gxwebsoft/shop/param/MerchantParam.java
+++ b/src/main/java/com/gxwebsoft/shop/param/MerchantParam.java
@@ -1,7 +1,9 @@
 package com.gxwebsoft.shop.param;
 
 import java.math.BigDecimal;
+import java.util.Set;
 
+import com.baomidou.mybatisplus.annotation.TableField;
 import com.baomidou.mybatisplus.annotation.TableLogic;
 import com.gxwebsoft.common.core.annotation.QueryField;
 import com.gxwebsoft.common.core.annotation.QueryType;
@@ -96,4 +98,11 @@ public class MerchantParam extends BaseParam {
     @QueryField(type = QueryType.EQ)
     private Integer sortNumber;
 
+    @ApiModelProperty(value = "商户ID集合")
+    @TableField(exist = false)
+    private Set<Integer> merchantIds;
+
+    @ApiModelProperty(value = "商户编号集合")
+    @TableField(exist = false)
+    private Set<String> merchantCodes;
 }