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

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

Browse Source
This commit is contained in:
zhangchenbiao
2024-04-16 15:25:00 +08:00
parent 77ad656b8c 1ab170b14b
commit cc7850e415
2 changed files with 12 additions and 13 deletions
Download Patch File Download Diff File Expand all files Collapse all files

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

@@ -139,14 +139,13 @@ public class IntentAgreementServiceImpl extends LineFlowService implements Inten
WorkflowSubStageEnum nextStage = workflowSubStageEnum.getNextStage();
//更新线索阶段
lineInfoDAO.updateWorkflowStage(lineInfo.getId(), nextStage, nextStage.getInitStatus(),userId);
//更新auditId
SigningBaseInfoDO signingBaseInfoDO = intentAgreementMapper.selectByPartnerIdOrLineId(null, lineInfo.getId());
if (Objects.nonNull(signingBaseInfoDO)) {
intentAgreementMapper.updateAuditId(lineInfo.getId(), auditId);
} else {
throw new ServiceException("无法更新,没有对应的签约基本信息");
}
}
//更新auditId
SigningBaseInfoDO signingBaseInfoDO = intentAgreementMapper.selectByPartnerIdOrLineId(null, lineInfo.getId());
if (Objects.nonNull(signingBaseInfoDO)) {
intentAgreementMapper.updateAuditId(lineInfo.getId(), auditId);
} else {
throw new ServiceException("无法更新,没有对应的签约基本信息");
}
return Boolean.TRUE;
}
@@ -168,9 +167,9 @@ public class IntentAgreementServiceImpl extends LineFlowService implements Inten
lineInfo.setWorkflowSubStageStatus(WorkflowSubStageStatusEnum.SIGN_INTENT_AGREEMENT_80.getCode());
lineInfo.setUpdateUserId(userId);
lineInfoDAO.updateLineInfo(lineInfo);
//更新auditId
intentAgreementMapper.updateAuditId(lineInfo.getId(), auditId);
}
//更新auditId
intentAgreementMapper.updateAuditId(lineInfo.getId(), auditId);
return Boolean.TRUE;
}

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

@@ -277,7 +277,7 @@ public class LineServiceImpl implements LineService {
if (lineInfo==null){
throw new ServiceException(ErrorCodeEnum.LINE_ID_IS_NOT_EXIST);
}
if (lineInfo.getLineStatus().equals(LineStatusEnum.PUBLIC_SEAS.getCode())){
if (!lineInfo.getLineStatus().equals(LineStatusEnum.PUBLIC_SEAS.getCode())&&!transferFlag){
throw new ServiceException(ErrorCodeEnum.NOT_IN_PUBLIC_SEA);
}
if (lineInfo.getInvestmentManager().equals(changeInvestmentRequest.getInvestmentManagerId())){
@@ -381,7 +381,7 @@ public class LineServiceImpl implements LineService {
}
hyPartnerUserInfoDO = new HyPartnerUserInfoDO();
hyPartnerUserInfoDO.setMobile(addLineRequest.getMobile());
hyPartnerUserInfoDO.setUserChannelId(Integer.getInteger(UserChannelEnum.ADD.getCode()));
hyPartnerUserInfoDO.setUserChannelId(Integer.valueOf(UserChannelEnum.ADD.getCode()));
hyPartnerUserInfoDO.setPartnerId(UUIDUtils.get32UUID());
hyPartnerUserInfoDAO.insertSelective(hyPartnerUserInfoDO);
LineInfoDO lineInfoDO = new LineInfoDO();
@@ -392,7 +392,7 @@ public class LineServiceImpl implements LineService {
lineInfoDO.setWorkflowSubStageStatus(WorkflowSubStageStatusEnum.INTENT_0.getCode());
lineInfoDO.setWantShopAreaId(addLineRequest.getWantShopAreaId());
lineInfoDO.setUsername(addLineRequest.getUserName());
lineInfoDO.setLineSource(Integer.getInteger(UserChannelEnum.ADD.getCode()));
lineInfoDO.setLineSource(Integer.valueOf(UserChannelEnum.ADD.getCode()));
lineInfoDO.setPartnerId(hyPartnerUserInfoDO.getPartnerId());
String userId = null;
if (addLineRequest.getInvestmentManagerUserId()!=null){