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

Merge remote-tracking branch 'origin/cc_20241008_sysBuildAndAdjust' into cc_20241008_sysBuildAndAdjust

Browse Source
This commit is contained in:
shuo.wang
2024-10-12 16:30:41 +08:00
parent 627439d3d1 dfc43a11d8
commit cb433ddd35
2 changed files with 11 additions and 9 deletions
Download Patch File Download Diff File Expand all files Collapse all files

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

@@ -81,7 +81,8 @@ public class JoinIntentionServiceImpl extends LineFlowService implements JoinInt
lineInfoParam.setInvestmentManager(userByRoleNameAndAreaId.getUserId());
}
lineInfoParam.setLineStatus(1);
if (lineInfoParam.getWantShopAreaId() != null) {
//强加盟 前期不确定意向区域
if (lineInfoParam.getWantShopAreaId() != null&&lineInfoDO.getJoinMode()==1) {
Long regionId = regionAreaConfigDao.getByWantShopAreaId(lineInfoParam.getWantShopAreaId());
lineInfoParam.setRegionId(regionId);
}

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

@@ -436,9 +436,11 @@ public class LineServiceImpl implements LineService {
lineInfoDO.setUsername(addLineRequest.getUserName());
lineInfoDO.setLineSource(Integer.valueOf(UserChannelEnum.ADD.getCode()));
lineInfoDO.setPartnerId(hyPartnerUserInfoDO.getPartnerId());
Long regionId = regionAreaConfigDao.getByWantShopAreaId(addLineRequest.getWantShopAreaId());
lineInfoDO.setRegionId(regionId);
lineInfoDO.setInvestmentManager(getInvestmentManagerUserId(addLineRequest));
if (addLineRequest.getJoinMode()==1){
Long regionId = regionAreaConfigDao.getByWantShopAreaId(addLineRequest.getWantShopAreaId());
lineInfoDO.setRegionId(regionId);
}
lineInfoDO.setInvestmentManager(getInvestmentManagerUserId(addLineRequest, userInfo));
lineInfoDO.setCreateUserId(userInfo.getUserId());
lineInfoDO.setUpdateUserId(userInfo.getUserId());
lineInfoDAO.insertOrUpdate(lineInfoDO);
@@ -450,17 +452,16 @@ public class LineServiceImpl implements LineService {
* @param addLineRequest
* @return
*/
private String getInvestmentManagerUserId(AddLineRequest addLineRequest){
private String getInvestmentManagerUserId(AddLineRequest addLineRequest,LoginUserInfo userInfo){
//如果选择了招商经理 直接使用该招商经理
if (StringUtils.isNotBlank(addLineRequest.getInvestmentManagerUserId())){
return addLineRequest.getInvestmentManagerUserId();
}
//如果是强加盟 使用强加盟督导跟进线索
UserRoleEnum userRoleEnum = UserRoleEnum.SUPERVISION;
//如果是强加盟 使用新建线索人员跟进线索
if (CommonConstants.TWO==addLineRequest.getJoinMode()){
userRoleEnum = UserRoleEnum.STRONG_INVESTMENT_COMMISSIONER;
return userInfo.getUserId();
}
EnterpriseUserDO user = userAuthMappingService.getUserByRoleEnumAndWantShopAreaId(userRoleEnum, addLineRequest.getWantShopAreaId());
EnterpriseUserDO user = userAuthMappingService.getUserByRoleEnumAndWantShopAreaId(UserRoleEnum.SUPERVISION, addLineRequest.getWantShopAreaId());
return user.getUserId();
}