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

fix

Browse Source
This commit is contained in:
shuo.wang
2024-10-13 14:31:43 +08:00
parent ee996f6b67
commit 637fb7f76b
2 changed files with 12 additions and 14 deletions
Download Patch File Download Diff File Expand all files Collapse all files

4
coolstore-partner-model/src/main/java/com/cool/store/response/PlatformBuildResponse.java
View File

@@ -46,6 +46,6 @@ public class PlatformBuildResponse {
@ApiModelProperty("初审原因")
private String reason;
@ApiModelProperty("小程序美团外卖和饿了么，开通成功或失败后展示的反馈")
private String ultimatelyReason;
@ApiModelProperty("小程序美团外卖和饿了吗勇这个：最新审批原因")
private String newReason;
}

22
coolstore-partner-service/src/main/java/com/cool/store/service/impl/PlatformBuildServiceImpl.java
View File

@@ -281,12 +281,12 @@ public class PlatformBuildServiceImpl implements PlatformBuildService {
BeanUtils.copyProperties(platformBuildDO, platformBuildResponse);
if (type.equals(PlatformBuildEnum.E_LE_ME.getCode())) {
OperationLogDO trial = operationLogDAO.getByCondition(shopId, SHOP_SUB_STAGE_STATUS_211.getShopSubStageStatus());
OperationLogDO accept = operationLogDAO.getByCondition(shopId, SHOP_SUB_STAGE_STATUS_213.getShopSubStageStatus());
doSomething(platformBuildResponse, trial, accept);
ShopAuditInfoDO auditInfo = shopAuditInfoDAO.getAuditInfo(platformBuildDO.getAuditId());
doSomething(platformBuildResponse, trial, auditInfo);
} else if (type.equals(PlatformBuildEnum.MEI_TUAN_WAI_MAI.getCode())) {
OperationLogDO trial = operationLogDAO.getByCondition(shopId, SHOP_SUB_STAGE_STATUS_191.getShopSubStageStatus());
OperationLogDO accept = operationLogDAO.getByCondition(shopId, SHOP_SUB_STAGE_STATUS_193.getShopSubStageStatus());
doSomething(platformBuildResponse, trial, accept);
ShopAuditInfoDO auditInfo = shopAuditInfoDAO.getAuditInfo(platformBuildDO.getAuditId());
doSomething(platformBuildResponse, trial, auditInfo);
} else{
ShopAuditInfoDO auditInfo = shopAuditInfoDAO.getAuditInfo(platformBuildDO.getAuditId());
@@ -301,7 +301,7 @@ public class PlatformBuildServiceImpl implements PlatformBuildService {
return platformBuildResponse;
}
private void doSomething(PlatformBuildResponse platformBuildResponse, OperationLogDO trial, OperationLogDO accept) {
private void doSomething(PlatformBuildResponse platformBuildResponse, OperationLogDO trial, ShopAuditInfoDO auditInfo ) {
if (Objects.nonNull(trial)) {
ShopAuditInfoDO atrialAuditInfo = shopAuditInfoDAO.getAuditInfo(trial.getAuditResultId());
if (Objects.nonNull(atrialAuditInfo)) {
@@ -312,15 +312,13 @@ public class PlatformBuildServiceImpl implements PlatformBuildService {
}
}
}
if (Objects.nonNull(accept)) {
ShopAuditInfoDO acceptAuditInfo = shopAuditInfoDAO.getAuditInfo(accept.getAuditResultId());
if (Objects.nonNull(acceptAuditInfo)) {
if (acceptAuditInfo.getResultType().equals(AuditResultTypeEnum.PASS.getCode())) {
platformBuildResponse.setUltimatelyReason(acceptAuditInfo.getPassReason());
if (Objects.nonNull(auditInfo)) {
if (auditInfo.getResultType().equals(AuditResultTypeEnum.PASS.getCode())) {
platformBuildResponse.setNewReason(auditInfo.getPassReason());
} else {
platformBuildResponse.setUltimatelyReason(acceptAuditInfo.getRejectReason());
platformBuildResponse.setNewReason(auditInfo.getRejectReason());
}
}
}
}