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-common/src/main/java/com/cool/store/constants/CommonConstants.java
View File

@@ -151,6 +151,8 @@ public class CommonConstants {
// 线索选择的意向区域没有绑定战区，线索分配给【拓展经理胡德龙】
// public static final String DEAULT_INVESTMENT_JOBNUMBER = "17021329";
public static final String DEAULT_INVESTMENT_JOBNUMBER = "020125244825417786";
// public static final String DEAULT_SELECT_SITE_MANAGER = "09080211";
public static final String DEAULT_SELECT_SITE_MANAGER = "020125244825417786";
}

16
coolstore-partner-common/src/main/java/com/cool/store/enums/UserRoleEnum.java
View File

@@ -12,11 +12,19 @@ import java.util.stream.Collectors;
* @date 2024-03-22 16:37
*/
public enum UserRoleEnum {
INVESTMENT_MANAGER(100000000L, "招商经理"),
SELECT_SITE_MANAGER(110000000L, "选址人员"),
REGION_MANAGER(120000000L, "大区经理"),
INVESTMENT_COMMISSIONER(100000000L, "招商专员"),
SELECT_SITE_COMMISSIONER(110000000L, "选址专员"),
REGION_MANAGER(120000000L, "大区执行总经理"),
THEATER_MANAGER(130000000L, "战区经理"),
OPERATIONS_MANAGER(140000000L, "营运经理"),
TRAINER(150000000L, "训练"),
XFSG_CLERK(160000000L, "店员"),
XFSG_SHOPOWNER(170000000L, "店长"),
SUPERVISION(180000000L, "督导"),
SELECT_SITE_LEADER(190000000L, "选址组长"),
SELECT_SITE_MANAGER(200000000L, "选址经理"),
INVESTMENT_MANAGER(210000000L, "招商经理"),
HEADQUARTERS_LEADER(220000000L, "总部负责人"),
;
private Long code;

1
coolstore-partner-model/src/main/java/com/cool/store/request/RegionAreaConfigAddRequest.java
View File

@@ -21,7 +21,6 @@ public class RegionAreaConfigAddRequest {
private Long regionId;
@ApiModelProperty("省市集合")
@NotEmpty(message = "省市不能为空")
private List<Long> areaIdList;
}

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;
}