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

Merge remote-tracking branch 'xfsg/cc_partner_init' into cc_partner_init

Browse Source
This commit is contained in:
苏竹红
2024-04-19 09:52:11 +08:00
parent 793f07bb9b f21bb13a8e
commit fdb98aff43
7 changed files with 26 additions and 8 deletions
Download Patch File Download Diff File Expand all files Collapse all files

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

@@ -75,7 +75,7 @@ public class JoinIntentionServiceImpl extends LineFlowService implements JoinInt
}
LineInfoDO lineInfoDO = lineInfoMapper.getByLineId(request.getLineId());
if ((Objects.nonNull(request.getAreaCode()) && Objects.nonNull(lineInfoDO) && StringUtils.isBlank(lineInfoDO.getInvestmentManager())) || (Objects.isNull(lineInfoDO))){
EnterpriseUserDO userByRoleNameAndAreaId = userAuthMappingService.getUserByRoleEnumAndAreaId(UserRoleEnum.INVESTMENT_MANAGER, Long.valueOf(request.getAreaCode()));
EnterpriseUserDO userByRoleNameAndAreaId = userAuthMappingService.getUserByRoleEnumAndAreaId(UserRoleEnum.INVESTMENT_COMMISSIONER, Long.valueOf(request.getAreaCode()));
lineInfoParam.setInvestmentManager(userByRoleNameAndAreaId.getUserId());
}
//todo 目前写死为进入私海

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

@@ -405,7 +405,7 @@ public class LineServiceImpl implements LineService {
if (StringUtils.isNotBlank(addLineRequest.getInvestmentManagerUserId())){
userId = addLineRequest.getInvestmentManagerUserId();
}else {
EnterpriseUserDO user = userAuthMappingService.getUserByRoleEnumAndAreaId(UserRoleEnum.INVESTMENT_MANAGER, addLineRequest.getWantShopAreaId());
EnterpriseUserDO user = userAuthMappingService.getUserByRoleEnumAndAreaId(UserRoleEnum.INVESTMENT_COMMISSIONER, addLineRequest.getWantShopAreaId());
userId = user.getUserId();
}
Long regionId = regionAreaConfigDao.getByWantShopAreaId(addLineRequest.getWantShopAreaId());

1
coolstore-partner-service/src/main/java/com/cool/store/service/impl/RegionAreaConfigServiceImpl.java
View File

@@ -45,6 +45,7 @@ public class RegionAreaConfigServiceImpl implements RegionAreaConfigService {
throw new ServiceException(ErrorCodeEnum.ONLY_WAR_REGION_CONFIG);
}
List<Long> areaIdList = regionAreaConfigAddRequest.getAreaIdList();
regionAreaConfigDao.deleteRegionAreaConfigByRegionId(regionAreaConfigAddRequest.getRegionId());
if(CollectionUtils.isEmpty(areaIdList)){
return Boolean.TRUE;
}

10
coolstore-partner-service/src/main/java/com/cool/store/service/impl/UserAuthMappingServiceImpl.java
View File

@@ -125,12 +125,20 @@ public class UserAuthMappingServiceImpl implements UserAuthMappingService {
}
private EnterpriseUserDO fillDefaultUser(UserRoleEnum userRoleEnum) {
if(UserRoleEnum.INVESTMENT_MANAGER.equals(userRoleEnum)){
// 如果找不到招商专员，则分配给默认的招商经理
if(UserRoleEnum.INVESTMENT_COMMISSIONER.equals(userRoleEnum)){
EnterpriseUserDO defaultUser = enterpriseUserDAO.getUserInfoByJobnumber(CommonConstants.DEAULT_INVESTMENT_JOBNUMBER);
if(defaultUser == null){
defaultUser = enterpriseUserDAO.getUserInfoById(CommonConstants.DEAULT_INVESTMENT_JOBNUMBER);
}
return defaultUser;
}else if(UserRoleEnum.SELECT_SITE_COMMISSIONER.equals(userRoleEnum)){
// 如果找不到选址专员，则分配给默认的选址经理
EnterpriseUserDO defaultUser = enterpriseUserDAO.getUserInfoByJobnumber(CommonConstants.DEAULT_SELECT_SITE_MANAGER);
if(defaultUser == null){
defaultUser = enterpriseUserDAO.getUserInfoById(CommonConstants.DEAULT_SELECT_SITE_MANAGER);
}
return defaultUser;
}
return null;
}