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

Merge branch 'cc_20241008_sysBuildAndAdjust' into 'master'

Browse Source 
fix 提交意向申请，修改线索阶段

See merge request hangzhou/java/custom_zxjp!24
This commit is contained in:
苏竹红
2024-11-07 11:53:47 +00:00
parent 780824176e 3f35f7f5ed
commit d36d9f2017
1 changed files with 4 additions and 4 deletions
Download Patch File Download Diff File Expand all files Collapse all files

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

@@ -35,7 +35,7 @@ public class JoinIntentionServiceImpl extends LineFlowService implements JoinInt
JoinIntentionMapper joinIntentionMapper; JoinIntentionMapper joinIntentionMapper;
@Resource @Resource
QualificationsInfoDAO qualificationsInfoDAO; QualificationsInfoDAO qualificationsInfoDAO;
@Resource @Resource
LineInfoDAO lineInfoDAO; LineInfoDAO lineInfoDAO;
@@ -68,7 +68,7 @@ public class JoinIntentionServiceImpl extends LineFlowService implements JoinInt
} }
LineInfoDO lineInfoDO = lineInfoMapper.getByLineId(request.getLineId()); LineInfoDO lineInfoDO = lineInfoMapper.getByLineId(request.getLineId());
log.info("lineInfoDO : {}", JSONObject.toJSONString(lineInfoDO)); log.info("lineInfoDO : {}", JSONObject.toJSONString(lineInfoDO));
if (!Objects.isNull(lineInfoDO) && (WorkflowSubStageEnum.INTEND.getCode()<lineInfoDO.getWorkflowSubStage())) { if (!Objects.isNull(lineInfoDO) && (WorkflowSubStageEnum.INTEND.getCode() < lineInfoDO.getWorkflowSubStage())) {
throw new ServiceException(ErrorCodeEnum.INTENT_PASS); throw new ServiceException(ErrorCodeEnum.INTENT_PASS);
} }
//更改线索流程子状态为【待审核】 //更改线索流程子状态为【待审核】
@@ -80,14 +80,14 @@ public class JoinIntentionServiceImpl extends LineFlowService implements JoinInt
// EnterpriseUserDO userByRoleNameAndAreaId = userAuthMappingService.getUserByRoleEnumAndWantShopAreaId(UserRoleEnum.SUPERVISION, Long.valueOf(request.getAreaCode())); // EnterpriseUserDO userByRoleNameAndAreaId = userAuthMappingService.getUserByRoleEnumAndWantShopAreaId(UserRoleEnum.SUPERVISION, Long.valueOf(request.getAreaCode()));
// lineInfoParam.setInvestmentManager(userByRoleNameAndAreaId.getUserId()); // lineInfoParam.setInvestmentManager(userByRoleNameAndAreaId.getUserId());
// } // }
lineInfoParam.setLineStatus(0);
//强加盟 前期不确定意向区域 //强加盟 前期不确定意向区域
// if (lineInfoParam.getWantShopAreaId() != null&&lineInfoDO.getJoinMode()==1) { // if (lineInfoParam.getWantShopAreaId() != null&&lineInfoDO.getJoinMode()==1) {
// Long regionId = regionAreaConfigDao.getByWantShopAreaId(lineInfoParam.getWantShopAreaId()); // Long regionId = regionAreaConfigDao.getByWantShopAreaId(lineInfoParam.getWantShopAreaId());
// lineInfoParam.setRegionId(regionId); // lineInfoParam.setRegionId(regionId);
// } // }
if (StringUtils.isBlank(lineInfoDO.getInvestmentManager())){ if (StringUtils.isBlank(lineInfoDO.getInvestmentManager())) {
lineInfoParam.setFranchiseBrand(String.valueOf(FranchiseBrandEnum.ZXJP.getCode())); lineInfoParam.setFranchiseBrand(String.valueOf(FranchiseBrandEnum.ZXJP.getCode()));
lineInfoParam.setLineStatus(0);
} }
lineInfoDAO.insertOrUpdate(lineInfoParam); lineInfoDAO.insertOrUpdate(lineInfoParam);
QualificationsInfoDO qualificationsInfoDO = request.toQualificationsInfoDO(); QualificationsInfoDO qualificationsInfoDO = request.toQualificationsInfoDO();