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-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 @@ 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..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); @@ -425,8 +431,7 @@ public class LineInterviewServiceImpl extends LineFlowService implements LineInt @Override protected Boolean auditClose(Long auditId, LineInfoDO lineInfo) { - auditReject(auditId, lineInfo); - return true; + return Boolean.TRUE; } } 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); }