suzhuhong/zxjp-web
1
0
Fork 0
Code Issues Pull Requests Actions Packages Projects Releases Wiki Activity

Merge remote-tracking branch 'origin/cc_20250106_v2.4' into cc_20250106_v2.4

Browse Source
This commit is contained in:
苏竹红
2025-01-21 16:12:39 +08:00
parent 532bf7d366 77a89376f3
commit 9f9a1c890c
2 changed files with 2 additions and 7 deletions
Download Patch File Download Diff File Expand all files Collapse all files

7
coolstore-partner-dao/src/main/resources/mapper/ShopInfoMapper.xml
View File

@@ -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">

2
coolstore-partner-service/src/main/java/com/cool/store/service/impl/ShopServiceImpl.java
View File

@@ -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) {