From 77a89376f3d5b8fff39f6cc4070efbdc568b9bd8 Mon Sep 17 00:00:00 2001
From: "shuo.wang" <shuo.wang@hao168.com>
Date: Tue, 21 Jan 2025 15:08:25 +0800
Subject: [PATCH] =?UTF-8?q?fix=20getShopList=20=E4=BF=AE=E6=94=B9=E8=8E=B7?=
 =?UTF-8?q?=E5=8F=96=E8=8E=B7=E5=8F=96=E5=BA=97=E9=93=BA=E5=88=97=E8=A1=A8?=
 =?UTF-8?q?=E9=80=BB=E8=BE=91?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

---
 .../src/main/resources/mapper/ShopInfoMapper.xml           | 7 +------
 .../java/com/cool/store/service/impl/ShopServiceImpl.java  | 2 +-
 2 files changed, 2 insertions(+), 7 deletions(-)

diff --git a/coolstore-partner-dao/src/main/resources/mapper/ShopInfoMapper.xml b/coolstore-partner-dao/src/main/resources/mapper/ShopInfoMapper.xml
index fc7065e28..6696ea000 100644
--- a/coolstore-partner-dao/src/main/resources/mapper/ShopInfoMapper.xml
+++ b/coolstore-partner-dao/src/main/resources/mapper/ShopInfoMapper.xml
@@ -349,12 +349,7 @@
             #{item}
             </foreach>
         </if>
-        <if test="userId ==null or userId ==''">
-           and shop_status in (0,1)
-        </if>
-        <if test="userId !=null and userId !=''">
-          and  shop_status in (0,1,2)
-        </if>
+
     </select>
 
   <select id="getShopPointListByDevelopmentManager" resultType="com.cool.store.dto.point.ShopPointDTO">
diff --git a/coolstore-partner-service/src/main/java/com/cool/store/service/impl/ShopServiceImpl.java b/coolstore-partner-service/src/main/java/com/cool/store/service/impl/ShopServiceImpl.java
index 1ea4ce471..e4c040a87 100644
--- a/coolstore-partner-service/src/main/java/com/cool/store/service/impl/ShopServiceImpl.java
+++ b/coolstore-partner-service/src/main/java/com/cool/store/service/impl/ShopServiceImpl.java
@@ -126,7 +126,7 @@ public class ShopServiceImpl implements ShopService {
     /**
      * @Auther: wangshuo
      * @Date: 2025/1/13
-     * @description: 当userId为空时，表示为mini，查询的门店不包括结束跟进的，否则为mini，查询的门店包括结束跟进的
+     * @description: 当userId为空时，表示为mini，查看所有门店，否则为pc，查询的门店跟进管辖区域进行展示 二者都不关注门店状态
      */
     @Override
     public List<MiniShopPageVO> getShopList(Long lineId, String userId) {