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

大区概念

Browse Source
This commit is contained in:
苏竹红
2024-07-02 16:50:09 +08:00
parent 3636a2189f
commit cd48677507
8 changed files with 14 additions and 25 deletions
Download Patch File Download Diff File Expand all files Collapse all files

3
coolstore-partner-model/src/main/java/com/cool/store/request/AuditPassRequest.java
View File

@@ -26,7 +26,4 @@ public class AuditPassRequest {
@ApiModelProperty("通过原因")
private String passReason;
@ApiModelProperty("战区regionId,只在意向加盟申请阶段使用")
private Long fightRegion;
}

4
coolstore-partner-service/src/main/java/com/cool/store/service/impl/IntentAgreementServiceImpl.java
View File

@@ -142,9 +142,7 @@ public class IntentAgreementServiceImpl extends LineFlowService implements Inten
updateLine.setId(lineInfo.getId());
updateLine.setWorkflowStage(WorkflowStageEnum.STORE.getCode());
updateLine.setWorkflowSubStageStatus(WorkflowSubStageStatusEnum.SIGN_INTENT_AGREEMENT_125.getCode());
EnterpriseUserDO enterpriseUser = userAuthMappingService.getUserByRoleEnumAndWantShopAreaId(UserRoleEnum.SELECT_SITE_COMMISSIONER, lineInfo.getWantShopAreaId());
String developmentManager = Optional.ofNullable(enterpriseUser).map(EnterpriseUserDO::getUserId).orElse(null);
updateLine.setDevelopmentManager(developmentManager);
updateLine.setDevelopmentManager(lineInfo.getInvestmentManager());
updateLine.setUpdateUserId(userId);
lineInfoDAO.updateLineInfo(updateLine);
//初始化店铺

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

@@ -77,13 +77,13 @@ public class JoinIntentionServiceImpl extends LineFlowService implements JoinInt
lineInfoParam.setWorkflowSubStage(WorkflowSubStageEnum.INTEND.getCode());
lineInfoParam.setWorkflowSubStageStatus(WorkflowSubStageStatusEnum.INTENT_5.getCode());
if ((Objects.nonNull(request.getAreaCode()) && Objects.nonNull(lineInfoDO) && StringUtils.isBlank(lineInfoDO.getInvestmentManager())) || (Objects.isNull(lineInfoDO))) {
EnterpriseUserDO userByRoleNameAndAreaId = userAuthMappingService.getUserByRoleEnumAndWantShopAreaId(UserRoleEnum.INVESTMENT_COMMISSIONER, Long.valueOf(request.getAreaCode()));
EnterpriseUserDO userByRoleNameAndAreaId = userAuthMappingService.getUserByRoleEnumAndWantShopAreaId(UserRoleEnum.SUPERVISION, Long.valueOf(request.getAreaCode()));
lineInfoParam.setInvestmentManager(userByRoleNameAndAreaId.getUserId());
}
lineInfoParam.setLineStatus(1);
if (lineInfoParam.getWantShopAreaId() != null) {
Long regionId = regionAreaConfigDao.getByWantShopAreaId(lineInfoParam.getWantShopAreaId());
lineInfoParam.setBigRegionId(regionId);
lineInfoParam.setRegionId(regionId);
}
lineInfoDAO.insertOrUpdate(lineInfoParam);
QualificationsInfoDO qualificationsInfoDO = request.toQualificationsInfoDO();

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

@@ -48,9 +48,6 @@ public abstract class LineFlowService {
if(!lineInfo.getWorkflowSubStage().equals(request.getWorkflowSubStage())){
throw new ServiceException(ErrorCodeEnum.WORK_FLOW_STAGE_PASS_ERROR);
}
if (WorkflowSubStageEnum.INTEND.getCode().equals(lineInfo.getWorkflowSubStage())){
lineInfo.setRegionId(request.getFightRegion());
}
String partnerId = lineInfo.getPartnerId();
LineAuditInfoDO auditInfo = new LineAuditInfoDO();
auditInfo.setLineId(request.getLineId());

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

@@ -102,14 +102,11 @@ public class LineServiceImpl implements LineService {
result.setInvestmentManagerName(user.getName());
result.setInvestmentManagerMobile(user.getMobile());
}
result.setBigRegionId(lineInfo.getBigRegionId());
if(lineInfo.getRegionId() != null && lineInfo.getRegionId() != 0){
Long bigRegionIdByAreaId = regionService.getBigRegionIdByAreaId(lineInfo.getWantShopAreaId());
Map<Long, String> regionNameMap = regionDao.getRegionNameMap(Arrays.asList(bigRegionIdByAreaId, lineInfo.getRegionId()));
result.setRegionId(lineInfo.getRegionId());
result.setRegionName(regionNameMap.get(lineInfo.getRegionId()));
result.setLargeRegionId(bigRegionIdByAreaId);
result.setLargeRegionName(regionNameMap.get(bigRegionIdByAreaId));
}
LineAuditInfoDO lineAuditInfoDO = lineAuditInfoDAO.getAuditInfoByLineId(lineInfo.getId());
if (lineAuditInfoDO!=null){
@@ -416,7 +413,8 @@ public class LineServiceImpl implements LineService {
if (StringUtils.isNotBlank(addLineRequest.getInvestmentManagerUserId())){
userId = addLineRequest.getInvestmentManagerUserId();
}else {
EnterpriseUserDO user = userAuthMappingService.getUserByRoleEnumAndWantShopAreaId(UserRoleEnum.INVESTMENT_COMMISSIONER, addLineRequest.getWantShopAreaId());
//督导角色是招商专员
EnterpriseUserDO user = userAuthMappingService.getUserByRoleEnumAndWantShopAreaId(UserRoleEnum.SUPERVISION, addLineRequest.getWantShopAreaId());
userId = user.getUserId();
}
Long regionId = regionAreaConfigDao.getByWantShopAreaId(addLineRequest.getWantShopAreaId());

12
coolstore-partner-service/src/main/java/com/cool/store/service/impl/PointServiceImpl.java
View File

@@ -988,12 +988,12 @@ public class PointServiceImpl implements PointService {
requestMap.put("partnerMobile",lineInfo.getMobile());
requestMap.put("lineId",String.valueOf(lineInfo.getId()));
requestMap.put("shopId",String.valueOf(shopId));
if (Objects.nonNull(shopInfo.getShopName())) {
requestMap.put("storeName",shopInfo.getShopName());
commonService.sendMessage(Arrays.asList(lineInfo.getInvestmentManager()),MessageEnum.MESSAGE_16,requestMap);
}else {
commonService.sendMessage(Arrays.asList(lineInfo.getInvestmentManager()),MessageEnum.MESSAGE_16_1,requestMap);
}
// if (Objects.nonNull(shopInfo.getShopName())) {
// requestMap.put("storeName",shopInfo.getShopName());
// commonService.sendMessage(Arrays.asList(lineInfo.getInvestmentManager()),MessageEnum.MESSAGE_16,requestMap);
// }else {
// commonService.sendMessage(Arrays.asList(lineInfo.getInvestmentManager()),MessageEnum.MESSAGE_16_1,requestMap);
// }
}
return shopStageInfoDAO.updateShopStageAndAuditInfo(shopId, subStageStatus, auditId);
}

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

@@ -70,8 +70,7 @@ public class ShopServiceImpl implements ShopService {
shopInfo.setPartnerId(lineInfo.getPartnerId());
//初始化
shopInfo.setStoreNum(RandomEightCharCodeUtils.getCode());
EnterpriseUserDO supervisor = userAuthMappingService.hierarchicalSearch(UserRoleEnum.SUPERVISION, shopInfo.getRegionId());
shopInfo.setSupervisorUserId((Objects.isNull(supervisor)||supervisor.getUserId()==null)?lineInfo.getInvestmentManager():supervisor.getUserId());
shopInfo.setSupervisorUserId(lineInfo.getInvestmentManager());
shopInfo.setShopName("店铺" + NumberConverter.convertArabicToChinese(i + 1));
addShopList.add(shopInfo);
}

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

@@ -225,8 +225,8 @@ public class UserAuthMappingServiceImpl implements UserAuthMappingService {
private EnterpriseUserDO fillDefaultUser(UserRoleEnum userRoleEnum) {
String defaultJobnumber = getDefaultJobnumber(userRoleEnum);
// 如果找不到招商专员，则分配给默认的招商经理
if (UserRoleEnum.INVESTMENT_COMMISSIONER.equals(userRoleEnum)) {
// 如果找不到督导，则分配给默认的督导
if (UserRoleEnum.SUPERVISION.equals(userRoleEnum)) {
EnterpriseUserDO defaultUser = enterpriseUserDAO.getUserInfoByJobnumber(defaultJobnumber);
if (defaultUser == null) {
defaultUser = enterpriseUserDAO.getUserInfoById(defaultJobnumber);