From 5b29cdd0f9e74adecc41dbea2b0b77aad5c7fb6e Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?=E8=8B=8F=E7=AB=B9=E7=BA=A2?= Date: Tue, 16 Jul 2024 16:29:52 +0800 Subject: [PATCH] =?UTF-8?q?=E6=9D=A1=E4=BB=B6=E6=8E=A7=E5=88=B6?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- .../cool/store/service/impl/IntentAgreementServiceImpl.java | 3 +++ .../java/com/cool/store/service/impl/LinePayServiceImpl.java | 5 ++++- 2 files changed, 7 insertions(+), 1 deletion(-) 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 c7c0215bd..87a95e010 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 @@ -197,6 +197,9 @@ public class IntentAgreementServiceImpl extends LineFlowService implements Inten if (lineInfo == null){ throw new ServiceException(ErrorCodeEnum.LINE_ID_IS_NOT_EXIST); } + if ( !WorkflowSubStageStatusEnum.SIGN_INTENT_AGREEMENT_70.getCode().equals(lineInfo.getWorkflowSubStageStatus())) { + throw new ServiceException(ErrorCodeEnum.LINE_STATUS_NOT_ALLOW_OPERATE); + } LineInfoDO updateLine = new LineInfoDO(); updateLine.setId(lineInfo.getId()); updateLine.setWorkflowStage(WorkflowStageEnum.STORE.getCode()); diff --git a/coolstore-partner-service/src/main/java/com/cool/store/service/impl/LinePayServiceImpl.java b/coolstore-partner-service/src/main/java/com/cool/store/service/impl/LinePayServiceImpl.java index 121c3fd5b..07bf4f224 100644 --- a/coolstore-partner-service/src/main/java/com/cool/store/service/impl/LinePayServiceImpl.java +++ b/coolstore-partner-service/src/main/java/com/cool/store/service/impl/LinePayServiceImpl.java @@ -78,11 +78,14 @@ public class LinePayServiceImpl implements LinePayService { @Override public Boolean skipPay(Long lineId, LoginUserInfo user) { - log.info("skipIntentAgreement lineId:{},操作人:{}",lineId,user.getName()); + log.info("skipPay lineId:{},操作人:{}",lineId,user.getName()); LineInfoDO lineInfo = lineInfoDAO.getLineInfo(lineId); if (lineInfo == null) { throw new ServiceException(ErrorCodeEnum.LINE_ID_IS_NOT_EXIST); } + if ( !WorkflowSubStageStatusEnum.PAY_DEPOSIT_45.getCode().equals(lineInfo.getWorkflowSubStageStatus())) { + throw new ServiceException(ErrorCodeEnum.LINE_STATUS_NOT_ALLOW_OPERATE); + } lineInfo.setWorkflowSubStage(WorkflowSubStageEnum.SIGN_INTENT_AGREEMENT.getCode()); lineInfo.setWorkflowSubStageStatus(WorkflowSubStageStatusEnum.SIGN_INTENT_AGREEMENT_70.getCode()); lineInfo.setUpdateTime(new Date());