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

Merge branch 'cc_20240530_bugfix' into 'master'

Browse Source 
getSpecialShopStageInfo

See merge request hangzhou/java/custom_xfsg!6
This commit is contained in:
zhangchenbiao
2024-05-30 09:28:08 +00:00
parent c6a6132dab 7ac3f7725d
commit c6b86c4f6b
4 changed files with 6 additions and 5 deletions
Download Patch File Download Diff File Expand all files Collapse all files

4
coolstore-partner-dao/src/main/java/com/cool/store/dao/ShopStageInfoDAO.java
View File

@@ -247,8 +247,8 @@ public class ShopStageInfoDAO {
} }
public List<ShopStageInfoDO> getSpecialShopStageInfo(List<Long> shopIds, Integer shopSubStage, public List<ShopStageInfoDO> getSpecialShopStageInfo(List<Long> shopIds, Integer shopSubStage,
List<Integer> shopSubStageStatusList,String investmentUserId,Integer queryUserType){ List<Integer> shopSubStageStatusList,String investmentUserId,String supervisorId,Integer queryUserType){
return shopStageInfoMapper.getSpecialShopStageInfo( shopIds, shopSubStage, shopSubStageStatusList,investmentUserId,queryUserType); return shopStageInfoMapper.getSpecialShopStageInfo( shopIds, shopSubStage, shopSubStageStatusList,investmentUserId,supervisorId,queryUserType);
} }
/** /**
* @Auther: wangshuo * @Auther: wangshuo

1
coolstore-partner-dao/src/main/java/com/cool/store/mapper/ShopStageInfoMapper.java
View File

@@ -131,6 +131,7 @@ public interface ShopStageInfoMapper extends Mapper<ShopStageInfoDO> {
@Param("shopSubStage") Integer shopSubStage, @Param("shopSubStage") Integer shopSubStage,
@Param("shopSubStageStatusList") List<Integer> shopSubStageStatusList, @Param("shopSubStageStatusList") List<Integer> shopSubStageStatusList,
@Param("investmentUserId") String investmentUserId, @Param("investmentUserId") String investmentUserId,
@Param("supervisorId") String supervisorId,
@Param("queryUserType") Integer queryUserType); @Param("queryUserType") Integer queryUserType);
List<ShopStageInfoDO> getSubStageList(@Param("shopIds") List<Long> shopIds,@Param("shopSubStage") Integer shopSubStage); List<ShopStageInfoDO> getSubStageList(@Param("shopIds") List<Long> shopIds,@Param("shopSubStage") Integer shopSubStage);

4
coolstore-partner-dao/src/main/resources/mapper/ShopStageInfoMapper.xml
View File

@@ -259,8 +259,8 @@
<if test="investmentUserId!=null and investmentUserId!='' and queryUserType == 0"> <if test="investmentUserId!=null and investmentUserId!='' and queryUserType == 0">
and b.investment_manager = #{investmentUserId} and b.investment_manager = #{investmentUserId}
</if> </if>
<if test="investmentUserId!=null and investmentUserId!='' and queryUserType == 1"> <if test="supervisorId!=null and supervisorId!='' and queryUserType == 1">
and c.supervisor_id = #{investmentUserId} and c.supervisor_id = #{supervisorId}
</if> </if>
</where> </where>

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

@@ -367,7 +367,7 @@ public class DeskServiceImpl implements DeskService {
PageHelper.startPage(pageNum, pageSize); PageHelper.startPage(pageNum, pageSize);
//user.getJobNumber() //user.getJobNumber()
List<ShopStageInfoDO> specialShopStageInfo = shopStageInfoDAO.getSpecialShopStageInfo(null, shopSubStageEnum.getShopSubStage(), List<ShopStageInfoDO> specialShopStageInfo = shopStageInfoDAO.getSpecialShopStageInfo(null, shopSubStageEnum.getShopSubStage(),
subStageStatusList, user.getJobNumber(),type); subStageStatusList, user.getUserId(),user.getJobNumber(),type);
PageInfo result = new PageInfo<>(specialShopStageInfo); PageInfo result = new PageInfo<>(specialShopStageInfo);
List<Long> shopIds = specialShopStageInfo.stream().map(ShopStageInfoDO::getShopId).collect(Collectors.toList()); List<Long> shopIds = specialShopStageInfo.stream().map(ShopStageInfoDO::getShopId).collect(Collectors.toList());
List<Long> lineIds = specialShopStageInfo.stream().map(ShopStageInfoDO::getLineId).collect(Collectors.toList()); List<Long> lineIds = specialShopStageInfo.stream().map(ShopStageInfoDO::getLineId).collect(Collectors.toList());