diff --git a/coolstore-partner-model/src/main/java/com/cool/store/request/QualificationCallbackReq.java b/coolstore-partner-model/src/main/java/com/cool/store/request/QualificationCallbackReq.java index 54dea3b24..be49a5e0e 100644 --- a/coolstore-partner-model/src/main/java/com/cool/store/request/QualificationCallbackReq.java +++ b/coolstore-partner-model/src/main/java/com/cool/store/request/QualificationCallbackReq.java @@ -12,7 +12,7 @@ public class QualificationCallbackReq { private String instanceId; @ApiModelProperty(value = "流程状态 已完成:FINISHED, 已作废:CANCELED", required = true) - private String sequenceStatus; + private String instanceStatus; @ApiModelProperty(value = "意向签约人", required = true) private String intendedSigner; diff --git a/coolstore-partner-service/src/main/java/com/cool/store/service/impl/FlowServiceImpl.java b/coolstore-partner-service/src/main/java/com/cool/store/service/impl/FlowServiceImpl.java index b1b0ac3a4..e096bcd97 100644 --- a/coolstore-partner-service/src/main/java/com/cool/store/service/impl/FlowServiceImpl.java +++ b/coolstore-partner-service/src/main/java/com/cool/store/service/impl/FlowServiceImpl.java @@ -17,6 +17,7 @@ import com.cool.store.dto.response.MDMResultDTO; import com.cool.store.entity.*; import com.cool.store.enums.ErrorCodeEnum; import com.cool.store.enums.OperateTypeEnum; +import com.cool.store.enums.WorkflowStageEnum; import com.cool.store.enums.WorkflowStatusEnum; import com.cool.store.exception.ApiException; import com.cool.store.exception.ServiceException; @@ -223,7 +224,7 @@ public class FlowServiceImpl implements FlowService { public void qualificationCallback(QualificationCallbackReq request) { log.info("MDM800审批成功回调,request{}", JSONObject.toJSONString(request)); //1. 信息是否完整 - if (null == request.getSequenceStatus() || "".equals(request.getSequenceStatus())) { + if (null == request.getInstanceStatus() || "".equals(request.getInstanceStatus())) { log.error("MDM回调入参缺失,request{}", JSON.toJSONString(request)); throw new ServiceException("MDM回调错误!"); } @@ -234,7 +235,7 @@ public class FlowServiceImpl implements FlowService { throw new ServiceException(ErrorCodeEnum.INTERVIEW_NOT_EXIST); } //审核通过 - if ("FINISHED".equals(request.getSequenceStatus())) { + if ("FINISHED".equals(request.getInstanceStatus())) { //更新面试状态 interviewDAO.updateInterviewWorkflowStatus(interviewPlanId, WorkflowStatusEnum.INTERVIEW_6); //2. 准备需要的信息 @@ -255,8 +256,9 @@ public class FlowServiceImpl implements FlowService { Date passDate = new Date(request.getModifiedTime()); //3. 生成通过函并修改数据库相关信息 genPassLetterAndUpdateDB(partnerName, verifyCity, passDate, interviewId); + // TODO 4. 修改流程状态到下一阶段 4 分配选址开发经理 //审核未通过 - } else if ("CANCELED".equals(request.getSequenceStatus())) { + } else if ("CANCELED".equals(request.getInstanceStatus())) { interviewDAO.updateInterviewWorkflowStatus(interviewPlanId, WorkflowStatusEnum.INTERVIEW_7); } } diff --git a/coolstore-partner-webb/src/main/java/com/cool/store/controller/FlowController.java b/coolstore-partner-webb/src/main/java/com/cool/store/controller/FlowController.java index 3430521af..81496a428 100644 --- a/coolstore-partner-webb/src/main/java/com/cool/store/controller/FlowController.java +++ b/coolstore-partner-webb/src/main/java/com/cool/store/controller/FlowController.java @@ -36,7 +36,7 @@ public class FlowController { } @PostMapping("/qualificationReview/callback") - @ApiOperation("流程信息回调接口") + @ApiOperation("加盟商资质审核流程信息回调接口") public ResponseResult qualificationCallback(@RequestBody QualificationCallbackReq request) { flowService.qualificationCallback(request); return ResponseResult.success();