新增字段：merchantIds

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}, '%')

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;
 }