From 7425905c754550dc0ff1712c4363a415a7a683a9 Mon Sep 17 00:00:00 2001 From: guohb Date: Thu, 23 May 2024 17:32:16 +0800 Subject: [PATCH 1/3] fix --- .../cool/store/service/impl/IntentAgreementServiceImpl.java | 3 +++ 1 file changed, 3 insertions(+) diff --git a/coolstore-partner-service/src/main/java/com/cool/store/service/impl/IntentAgreementServiceImpl.java b/coolstore-partner-service/src/main/java/com/cool/store/service/impl/IntentAgreementServiceImpl.java index 5007271b7..42b6c284a 100644 --- a/coolstore-partner-service/src/main/java/com/cool/store/service/impl/IntentAgreementServiceImpl.java +++ b/coolstore-partner-service/src/main/java/com/cool/store/service/impl/IntentAgreementServiceImpl.java @@ -269,6 +269,9 @@ public class IntentAgreementServiceImpl extends LineFlowService implements Inten if (Objects.isNull(lineInfoDO)) { throw new ServiceException(ErrorCodeEnum.LINE_ID_IS_NOT_EXIST); } + if (lineInfoDO.getPartnerNum() != null){ + return new ResponseResult(200000,null,null); + } if ("1".equals(lineInfoDO.getSex())){ franchiseeDO.setSex(1); }else if ("2".equals(lineInfoDO.getSex())){ From fa7cbc447f726d92d1dc78c985a69d7b18f12567 Mon Sep 17 00:00:00 2001 From: "shuo.wang" Date: Thu, 23 May 2024 17:48:47 +0800 Subject: [PATCH 2/3] 1 --- .../cool/store/service/impl/AuditOpeningOperationPlanImpl.java | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/coolstore-partner-service/src/main/java/com/cool/store/service/impl/AuditOpeningOperationPlanImpl.java b/coolstore-partner-service/src/main/java/com/cool/store/service/impl/AuditOpeningOperationPlanImpl.java index b1c8217c6..7cba9607f 100644 --- a/coolstore-partner-service/src/main/java/com/cool/store/service/impl/AuditOpeningOperationPlanImpl.java +++ b/coolstore-partner-service/src/main/java/com/cool/store/service/impl/AuditOpeningOperationPlanImpl.java @@ -67,7 +67,7 @@ public class AuditOpeningOperationPlanImpl implements AuditOpeningOperationPlanS shopSubStageStatusEnum = ShopSubStageStatusEnum.SHOP_SUB_STAGE_STATUS_143; flag = Boolean.TRUE; }else { - shopSubStageStatusEnum = ShopSubStageStatusEnum.SHOP_SUB_STAGE_STATUS_141; + shopSubStageStatusEnum = ShopSubStageStatusEnum.SHOP_SUB_STAGE_STATUS_142; } shopStageInfoDAO.updateShopStageAndAuditInfo(request.getShopId(), shopSubStageStatusEnum, auditId); From a3eea33fe5dcd4e76d02aff3e7c3c59712fdc32e Mon Sep 17 00:00:00 2001 From: guohb Date: Thu, 23 May 2024 17:59:19 +0800 Subject: [PATCH 3/3] fix --- .../cool/store/service/impl/IntentAgreementServiceImpl.java | 3 --- 1 file changed, 3 deletions(-) diff --git a/coolstore-partner-service/src/main/java/com/cool/store/service/impl/IntentAgreementServiceImpl.java b/coolstore-partner-service/src/main/java/com/cool/store/service/impl/IntentAgreementServiceImpl.java index 42b6c284a..3fa0901dd 100644 --- a/coolstore-partner-service/src/main/java/com/cool/store/service/impl/IntentAgreementServiceImpl.java +++ b/coolstore-partner-service/src/main/java/com/cool/store/service/impl/IntentAgreementServiceImpl.java @@ -326,9 +326,6 @@ public class IntentAgreementServiceImpl extends LineFlowService implements Inten //鲜丰系统不稳定，会出现调用成功但内部状态未更改的情况，这时直接返回true即可 return true; } - if (StringUtil.isNotBlank(auditResult) && !auditResult.equals(String.valueOf(request.getAuditResult()))) { - throw new ServiceException(ErrorCodeEnum.AUDIT_RESULT_FALSE); - } if (request.getAuditResult() == 1) { AuditPassRequest auditPassRequest = new AuditPassRequest(); auditPassRequest.setLineId(lineInfoDO.getId());