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

Merge branch 'cc_20250702_getStore' into 'master'

Browse Source 
Cc 20250702 get store

See merge request hangzhou/java/custom_zxjp!124
This commit is contained in:
zhangchenbiao
2025-07-04 05:39:46 +00:00
parent eae14cccb6 b721e31ea5
commit 497feb114d
2 changed files with 13 additions and 14 deletions
Download Patch File Download Diff File Expand all files Collapse all files

2
coolstore-partner-dao/src/main/java/com/cool/store/dao/StoreDao.java
View File

@@ -65,7 +65,7 @@ public class StoreDao {
}
public List<MiniShopsResponse> getSubStoreByRegionIdsAndMobile(List<String> regionIdList, String mobile,String storeName,String storeNum) {
if(CollectionUtils.isEmpty(regionIdList)&&StringUtils.isBlank(mobile)) {
if(StringUtils.isBlank(mobile)) {
return new ArrayList<>();
}
return storeMapper.getSubStoreByRegionIdsAndMobile(regionIdList,mobile,storeName,storeNum);

25
coolstore-partner-service/src/main/java/com/cool/store/service/impl/StoreServiceImpl.java
View File

@@ -72,20 +72,19 @@ public class StoreServiceImpl implements StoreService {
public PageInfo<MiniShopsResponse> getStoreListByMobile(String mobile,Integer pageNum,Integer pageSize,String storeName,String storeNum) {
//根据手机号查询 标品userId
EnterpriseUserDO enterpriseUserDO = enterpriseUserDAO.selectByMobile(mobile);
if (enterpriseUserDO == null){
return new PageInfo<>();
}
//获取用户职位
List<Long> userRoleIds = enterpriseUserRoleDao.getUserRoleIds(enterpriseUserDO.getUserId());
//查询职位详情，筛选掉店外职位
List<SysRoleDO> roleIds = sysRoleDao.selectRoleByRoleIds(userRoleIds);
List<SysRoleDO> sysRoleDOS = roleIds.stream().filter(role -> "store_inside".equals(role.getPositionType())).collect(Collectors.toList());
List<String> regionIds = new ArrayList<>();
if (CollectionUtils.isNotEmpty(sysRoleDOS)){
//获取用户管辖区域
List<UserAuthMappingDO> userAuthMapping = userAuthMappingService.listUserAuthMappingByUserId(enterpriseUserDO.getUserId());
if (CollectionUtils.isNotEmpty(userAuthMapping)){
regionIds.addAll(userAuthMapping.stream().map(UserAuthMappingDO::getMappingId).collect(Collectors.toList()));
if (Objects.nonNull(enterpriseUserDO)){
//获取用户职位
List<Long> userRoleIds = enterpriseUserRoleDao.getUserRoleIds(enterpriseUserDO.getUserId());
//查询职位详情，筛选掉店外职位
List<SysRoleDO> roleIds = sysRoleDao.selectRoleByRoleIds(userRoleIds);
List<SysRoleDO> sysRoleDOS = roleIds.stream().filter(role -> "store_inside".equals(role.getPositionType())).collect(Collectors.toList());
if (CollectionUtils.isNotEmpty(sysRoleDOS)){
//获取用户管辖区域
List<UserAuthMappingDO> userAuthMapping = userAuthMappingService.listUserAuthMappingByUserId(enterpriseUserDO.getUserId());
if (CollectionUtils.isNotEmpty(userAuthMapping)){
regionIds.addAll(userAuthMapping.stream().map(UserAuthMappingDO::getMappingId).collect(Collectors.toList()));
}
}
}
PageHelper.startPage(pageNum,pageSize);