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-05-23 19:48:55 +08:00
parent bfd43636c7 a3eea33fe5
commit 560ac22d05
2 changed files with 4 additions and 4 deletions
Download Patch File Download Diff File Expand all files Collapse all files

2
coolstore-partner-service/src/main/java/com/cool/store/service/impl/AuditOpeningOperationPlanImpl.java
View File

@@ -67,7 +67,7 @@ public class AuditOpeningOperationPlanImpl implements AuditOpeningOperationPlanS
shopSubStageStatusEnum = ShopSubStageStatusEnum.SHOP_SUB_STAGE_STATUS_143; shopSubStageStatusEnum = ShopSubStageStatusEnum.SHOP_SUB_STAGE_STATUS_143;
flag = Boolean.TRUE; flag = Boolean.TRUE;
}else { }else {
shopSubStageStatusEnum = ShopSubStageStatusEnum.SHOP_SUB_STAGE_STATUS_141; shopSubStageStatusEnum = ShopSubStageStatusEnum.SHOP_SUB_STAGE_STATUS_142;
} }
shopStageInfoDAO.updateShopStageAndAuditInfo(request.getShopId(), shopStageInfoDAO.updateShopStageAndAuditInfo(request.getShopId(),
shopSubStageStatusEnum, auditId); shopSubStageStatusEnum, auditId);

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

@@ -269,6 +269,9 @@ public class IntentAgreementServiceImpl extends LineFlowService implements Inten
if (Objects.isNull(lineInfoDO)) { if (Objects.isNull(lineInfoDO)) {
throw new ServiceException(ErrorCodeEnum.LINE_ID_IS_NOT_EXIST); throw new ServiceException(ErrorCodeEnum.LINE_ID_IS_NOT_EXIST);
} }
if (lineInfoDO.getPartnerNum() != null){
return new ResponseResult(200000,null,null);
}
if ("1".equals(lineInfoDO.getSex())){ if ("1".equals(lineInfoDO.getSex())){
franchiseeDO.setSex(1); franchiseeDO.setSex(1);
}else if ("2".equals(lineInfoDO.getSex())){ }else if ("2".equals(lineInfoDO.getSex())){
@@ -323,9 +326,6 @@ public class IntentAgreementServiceImpl extends LineFlowService implements Inten
//鲜丰系统不稳定，会出现调用成功但内部状态未更改的情况，这时直接返回true即可 //鲜丰系统不稳定，会出现调用成功但内部状态未更改的情况，这时直接返回true即可
return true; return true;
} }
if (StringUtil.isNotBlank(auditResult) && !auditResult.equals(String.valueOf(request.getAuditResult()))) {
throw new ServiceException(ErrorCodeEnum.AUDIT_RESULT_FALSE);
}
if (request.getAuditResult() == 1) { if (request.getAuditResult() == 1) {
AuditPassRequest auditPassRequest = new AuditPassRequest(); AuditPassRequest auditPassRequest = new AuditPassRequest();
auditPassRequest.setLineId(lineInfoDO.getId()); auditPassRequest.setLineId(lineInfoDO.getId());