From aaede39b9c2cd02c19b4919eedb6adaaf34b914f Mon Sep 17 00:00:00 2001 From: zhangchenbiao Date: Wed, 10 Apr 2024 14:10:28 +0800 Subject: [PATCH 1/4] fix --- .../src/main/resources/mapper/LineInterviewMapper.xml | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/coolstore-partner-dao/src/main/resources/mapper/LineInterviewMapper.xml b/coolstore-partner-dao/src/main/resources/mapper/LineInterviewMapper.xml index 705a95ab1..cfc481db1 100644 --- a/coolstore-partner-dao/src/main/resources/mapper/LineInterviewMapper.xml +++ b/coolstore-partner-dao/src/main/resources/mapper/LineInterviewMapper.xml @@ -113,7 +113,7 @@ From 2c3c4843e8903989d7ed3460bb78ca0ee233651e Mon Sep 17 00:00:00 2001 From: zhangchenbiao Date: Wed, 10 Apr 2024 14:14:37 +0800 Subject: [PATCH 2/4] fix --- .../com/cool/store/service/impl/LineInterviewServiceImpl.java | 3 +-- 1 file changed, 1 insertion(+), 2 deletions(-) diff --git a/coolstore-partner-service/src/main/java/com/cool/store/service/impl/LineInterviewServiceImpl.java b/coolstore-partner-service/src/main/java/com/cool/store/service/impl/LineInterviewServiceImpl.java index 63c5dd657..c50b1a138 100644 --- a/coolstore-partner-service/src/main/java/com/cool/store/service/impl/LineInterviewServiceImpl.java +++ b/coolstore-partner-service/src/main/java/com/cool/store/service/impl/LineInterviewServiceImpl.java @@ -425,8 +425,7 @@ public class LineInterviewServiceImpl extends LineFlowService implements LineInt @Override protected Boolean auditClose(Long auditId, LineInfoDO lineInfo) { - auditReject(auditId, lineInfo); - return true; + return Boolean.TRUE; } } From 639e3e8679e5b63910b81e8aeb1a529cc0b47d54 Mon Sep 17 00:00:00 2001 From: guohb Date: Wed, 10 Apr 2024 14:29:04 +0800 Subject: [PATCH 3/4] InitiatingResponse --- .../controller/webb/PCIntentAgreementController.java | 8 ++++---- 1 file changed, 4 insertions(+), 4 deletions(-) diff --git a/coolstore-partner-web/src/main/java/com/cool/store/controller/webb/PCIntentAgreementController.java b/coolstore-partner-web/src/main/java/com/cool/store/controller/webb/PCIntentAgreementController.java index bdb6fdca7..879076fb7 100644 --- a/coolstore-partner-web/src/main/java/com/cool/store/controller/webb/PCIntentAgreementController.java +++ b/coolstore-partner-web/src/main/java/com/cool/store/controller/webb/PCIntentAgreementController.java @@ -33,14 +33,14 @@ public class PCIntentAgreementController { @PostMapping(path = "/initiating") @ApiOperation("kdz -> xfsg 发起意向协议流程") - public ResponseResult initiating(@RequestBody InitiatingRequest request) { - return ResponseResult.success(intentAgreementService.initiating(request)); + public InitiatingResponse initiating(@RequestBody InitiatingRequest request) { + return intentAgreementService.initiating(request); } @PostMapping(path = "/franchisee/save") @ApiOperation("kdz -> xfsg 加盟商新增") - public ResponseResult save(@RequestBody FranchiseeSaveRequest request) { - return ResponseResult.success(intentAgreementService.save(request)); + public InitiatingResponse save(@RequestBody FranchiseeSaveRequest request) { + return intentAgreementService.save(request); } From 263cef017b95b6439be8f97ac157322bc52a67f3 Mon Sep 17 00:00:00 2001 From: zhangchenbiao Date: Wed, 10 Apr 2024 14:30:12 +0800 Subject: [PATCH 4/4] =?UTF-8?q?=E8=BF=9B=E5=85=A5=E6=88=BF=E9=97=B4?= =?UTF-8?q?=E6=96=B0=E5=A2=9E=E6=A0=A1=E9=AA=8C?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- .../src/main/java/com/cool/store/enums/ErrorCodeEnum.java | 1 + .../cool/store/service/impl/LineInterviewServiceImpl.java | 6 ++++++ 2 files changed, 7 insertions(+) diff --git a/coolstore-partner-common/src/main/java/com/cool/store/enums/ErrorCodeEnum.java b/coolstore-partner-common/src/main/java/com/cool/store/enums/ErrorCodeEnum.java index 9ffd4d810..1c14ffdae 100644 --- a/coolstore-partner-common/src/main/java/com/cool/store/enums/ErrorCodeEnum.java +++ b/coolstore-partner-common/src/main/java/com/cool/store/enums/ErrorCodeEnum.java @@ -88,6 +88,7 @@ public enum ErrorCodeEnum { POINT_AUDIT_NODE_ERROR(600005, "当前审批任务异常", null), USER_NOT_TODO_AUDIT(600005, "当前用户没有待审批的任务", null), NOT_ALLOW_MODIFY_WANT_SHOP_NUM(600006, "当前阶段不允许直接修改意向开店数量", null), + USER_NOT_ALLOW_ENTER_ROOM(600007, "当前用户不允许进入面试房间", null), INTERVIEW_ENTER_FAIL(1021101, "进入面审间失败", null), DINGDING_USER_NOT_EXIST(1021102, "用户钉钉信息不存在，无法发起资质审核！", null), diff --git a/coolstore-partner-service/src/main/java/com/cool/store/service/impl/LineInterviewServiceImpl.java b/coolstore-partner-service/src/main/java/com/cool/store/service/impl/LineInterviewServiceImpl.java index c50b1a138..b5ee24b68 100644 --- a/coolstore-partner-service/src/main/java/com/cool/store/service/impl/LineInterviewServiceImpl.java +++ b/coolstore-partner-service/src/main/java/com/cool/store/service/impl/LineInterviewServiceImpl.java @@ -264,6 +264,12 @@ public class LineInterviewServiceImpl extends LineFlowService implements LineInt if (interviewInfo.getRoomStatus().equals(RoomStatus.CLOSED.getCode())) { throw new ServiceException(ErrorCodeEnum.ROOM_STATUS_ERROR); } + if(InterviewUserTypeEnum.INTERVIEWER.equals(userType) && !interviewUserId.equals(interviewInfo.getInterviewerUserId())){ + throw new ServiceException(ErrorCodeEnum.USER_NOT_ALLOW_ENTER_ROOM); + } + if(InterviewUserTypeEnum.LINE.equals(userType) && !interviewUserId.equals(interviewInfo.getPartnerId())){ + throw new ServiceException(ErrorCodeEnum.USER_NOT_ALLOW_ENTER_ROOM); + } String userName = enterpriseUserDAO.getUserName(interviewInfo.getInterviewerUserId()); Long lineId = interviewInfo.getLineId(); LineInfoDO lineInfo = lineInfoDAO.getLineInfo(lineId);