From 73a3ab769db92d9c7d8c35da3bce2887f3659620 Mon Sep 17 00:00:00 2001
From: "shuo.wang" <shuo.wang@hao168.com>
Date: Tue, 14 Jan 2025 19:03:29 +0800
Subject: [PATCH] =?UTF-8?q?fix=20=E5=BC=80=E5=BA=97=E7=AE=A1=E7=90=86?=
 =?UTF-8?q?=E6=9F=A5=E8=AF=A2=E6=9D=A1=E4=BB=B6?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

---
 .../resources/mapper/HyOpenAreaInfoMapper.xml |  2 +-
 .../main/resources/mapper/ShopInfoMapper.xml  | 21 +++++++++++++------
 .../cool/store/request/BranchShopRequest.java |  6 +++---
 3 files changed, 19 insertions(+), 10 deletions(-)

diff --git a/coolstore-partner-dao/src/main/resources/mapper/HyOpenAreaInfoMapper.xml b/coolstore-partner-dao/src/main/resources/mapper/HyOpenAreaInfoMapper.xml
index 0edd56b56..8092a33c8 100644
--- a/coolstore-partner-dao/src/main/resources/mapper/HyOpenAreaInfoMapper.xml
+++ b/coolstore-partner-dao/src/main/resources/mapper/HyOpenAreaInfoMapper.xml
@@ -318,7 +318,7 @@
     <select id="getChildrenListByParentIds" resultType="java.lang.Long">
         select id from xfsg_open_area_info where 1=1
         <if test="parentIds!=null and parentIds.size>0">
-            parent_id in
+          and  parent_id in
             <foreach collection="parentIds" item="parentId" separator="," open="(" close=")">
                 #{parentId}
             </foreach>
diff --git a/coolstore-partner-dao/src/main/resources/mapper/ShopInfoMapper.xml b/coolstore-partner-dao/src/main/resources/mapper/ShopInfoMapper.xml
index 215441918..e4d8219c1 100644
--- a/coolstore-partner-dao/src/main/resources/mapper/ShopInfoMapper.xml
+++ b/coolstore-partner-dao/src/main/resources/mapper/ShopInfoMapper.xml
@@ -309,14 +309,23 @@
         <if test="request.openTimeEnd != null ">
             <![CDATA[and DATE_ADD(a.create_time, INTERVAL 50 DAY) <= #{request.openTimeEnd}]]>
         </if>
-        <if test="request.joinMode!=null">
-            and a.join_mode = #{request.joinMode}
+        <if test="request.joinMode!=null and request.joinMode.size >0">
+            and a.join_mode in
+            <foreach collection="request.joinMode" item="item" index="index" open="(" separator="," close=")">
+                #{item}
+            </foreach>
         </if>
-        <if test="request.franchiseBrand!=null">
-            and a.franchise_brand = #{request.franchiseBrand}
+        <if test="request.franchiseBrand!=null and request.franchiseBrand.size>0">
+            and a.franchise_brand in
+            <foreach collection="request.franchiseBrand" item="item" index="index" open="(" separator="," close=")">
+                #{item}
+            </foreach>
         </if>
-        <if test="request.shopStatus!=null">
-            and a.shop_status = #{request.shopStatus}
+        <if test="request.shopStatus!=null and request.shopStatus.size>0">
+            and a.shop_status in
+            <foreach collection="request.shopStatus" item="item" index="index" open="(" separator="," close=")">
+                #{item}
+            </foreach>
         </if>
         <if test="request.wantShopAreaAllIds != null and request.wantShopAreaAllIds.size() > 0">
             and a.want_shop_area_id in
diff --git a/coolstore-partner-model/src/main/java/com/cool/store/request/BranchShopRequest.java b/coolstore-partner-model/src/main/java/com/cool/store/request/BranchShopRequest.java
index a64c48a91..d67bfaf43 100644
--- a/coolstore-partner-model/src/main/java/com/cool/store/request/BranchShopRequest.java
+++ b/coolstore-partner-model/src/main/java/com/cool/store/request/BranchShopRequest.java
@@ -26,11 +26,11 @@ public class BranchShopRequest  extends PageBasicInfo{
     @ApiModelProperty("意向开店区域")
     private List<Long> wantShopAreaId;
     @ApiModelProperty("加盟模式")
-    private Integer joinMode;
+    private List<Integer> joinMode;
     @ApiModelProperty("加盟品牌")
-    private Integer franchiseBrand;
+    private List<Integer>  franchiseBrand;
     @ApiModelProperty("开店状态")
-    private Integer shopStatus;
+    private List<Integer>  shopStatus;
     @ApiModelProperty("计划开业日期开始")
     private Date openTimeStart;
     @ApiModelProperty("计划开业日期结束")