From 63dcea0b1aade0d159492a280dc379c0a3264319 Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?=E4=BF=9E=E6=89=AC?= Date: Mon, 3 Jul 2023 16:51:55 +0800 Subject: [PATCH] =?UTF-8?q?=E5=AE=A1=E6=A0=B8=E5=9B=9E=E8=B0=83=E6=8E=A5?= =?UTF-8?q?=E5=8F=A3=E9=80=BB=E8=BE=91=E4=BF=AE=E6=94=B9?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- .../mapper/HyPartnerInterviewMapper.java | 2 ++ .../mapper/HyPartnerInterviewMapper.xml | 11 ++++++++ .../com/cool/store/service/FlowService.java | 2 +- .../store/service/impl/FlowServiceImpl.java | 26 +++++++++++++------ .../impl/HyPartnerLineInfoServiceImpl.java | 5 ++++ .../cool/store/controller/FlowController.java | 2 +- 6 files changed, 38 insertions(+), 10 deletions(-) diff --git a/coolstore-partner-dao/src/main/java/com/cool/store/mapper/HyPartnerInterviewMapper.java b/coolstore-partner-dao/src/main/java/com/cool/store/mapper/HyPartnerInterviewMapper.java index 26dafbf7a..98c1d88ed 100644 --- a/coolstore-partner-dao/src/main/java/com/cool/store/mapper/HyPartnerInterviewMapper.java +++ b/coolstore-partner-dao/src/main/java/com/cool/store/mapper/HyPartnerInterviewMapper.java @@ -78,6 +78,8 @@ public interface HyPartnerInterviewMapper { HyPartnerInterviewDO getInterviewInfoByInterviewPlanId(@Param("interviewPlanId") String interviewPlanId); + + HyPartnerInterviewDO getInterviewInfoByQualifyVerifyId(@Param("qualifyVerifyId") String qualifyVerifyId); /** * 修改面试状态 */ diff --git a/coolstore-partner-dao/src/main/resources/mapper/HyPartnerInterviewMapper.xml b/coolstore-partner-dao/src/main/resources/mapper/HyPartnerInterviewMapper.xml index d6e176266..c36696490 100644 --- a/coolstore-partner-dao/src/main/resources/mapper/HyPartnerInterviewMapper.xml +++ b/coolstore-partner-dao/src/main/resources/mapper/HyPartnerInterviewMapper.xml @@ -504,5 +504,16 @@ FROM hy_partner_interview WHERE FIND_IN_SET(#{videoUrl}, process_info) + \ No newline at end of file diff --git a/coolstore-partner-service/src/main/java/com/cool/store/service/FlowService.java b/coolstore-partner-service/src/main/java/com/cool/store/service/FlowService.java index 76ea04e11..5b2c064dd 100644 --- a/coolstore-partner-service/src/main/java/com/cool/store/service/FlowService.java +++ b/coolstore-partner-service/src/main/java/com/cool/store/service/FlowService.java @@ -14,5 +14,5 @@ import java.io.IOException; public interface FlowService { void createQualifyVerify(CreateQualifyVerifyReq request) throws ApiException, IOException; - void qualificationCallback(QualificationCallbackReq request); + void qualificationCallback(QualificationCallbackReq request) throws ApiException; } 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 3c7154152..d86b6e91b 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 @@ -23,13 +23,11 @@ import com.cool.store.mapper.HyPartnerCertificationInfoMapper; import com.cool.store.mapper.HyPartnerInterviewMapper; import com.cool.store.mapper.HyPartnerLineInfoMapper; import com.cool.store.oss.OSSServer; -import com.cool.store.request.CreateQualifyVerifyReq; -import com.cool.store.request.QualificationCallbackReq; -import com.cool.store.request.RpcCreateQualifyVerifyReq; -import com.cool.store.request.RpcGetMdmTokenReq; +import com.cool.store.request.*; import com.cool.store.request.data.flow.KeyText; import com.cool.store.request.data.flow.SkrRelshipProve; import com.cool.store.service.FlowService; +import com.cool.store.service.HyPartnerLineInfoService; import com.cool.store.service.LogService; import com.cool.store.utils.*; import lombok.extern.slf4j.Slf4j; @@ -92,6 +90,9 @@ public class FlowServiceImpl implements FlowService { @Autowired private LogService logService; + + @Autowired + private HyPartnerLineInfoService hyPartnerLineInfoService; @Override @Transactional public void createQualifyVerify(CreateQualifyVerifyReq request) throws ApiException, IOException { @@ -218,7 +219,7 @@ public class FlowServiceImpl implements FlowService { } @Override - public void qualificationCallback(QualificationCallbackReq request) { + public void qualificationCallback(QualificationCallbackReq request) throws ApiException { log.info("MDM800审批成功回调，request{}", JSONObject.toJSONString(request)); //1. 信息是否完整 if (null == request.getInstanceStatus() || "".equals(request.getInstanceStatus())) { @@ -226,11 +227,15 @@ public class FlowServiceImpl implements FlowService { throw new ServiceException("MDM回调错误！"); } //根据审核流程 id 获取面试会议相关 id - String interviewId = hyPartnerCertificationInfoMapper.getInterviewIdByQualifyVerifyId(request.getInstanceId()); - String interviewPlanId = hyPartnerCertificationInfoMapper.getInterviewPlanIdByQualifyVerifyId(request.getInstanceId()); - if (StringUtils.isEmpty(interviewPlanId)) { +// String interviewId = hyPartnerCertificationInfoMapper.getInterviewIdByQualifyVerifyId(request.getInstanceId()); +// String interviewPlanId = hyPartnerCertificationInfoMapper.getInterviewPlanIdByQualifyVerifyId(request.getInstanceId()); + HyPartnerInterviewDO hyPartnerInterviewDO = hyPartnerInterviewMapper.getInterviewInfoByQualifyVerifyId(request.getInstanceId()); + if (hyPartnerInterviewDO == null || hyPartnerInterviewDO.getInterviewPlanId() == null) { throw new ServiceException(ErrorCodeEnum.INTERVIEW_NOT_EXIST); } + String interviewId = hyPartnerInterviewDO.getId().toString(); + String interviewPlanId = hyPartnerInterviewDO.getInterviewPlanId().toString(); + Long partnerLineId = hyPartnerInterviewDO.getPartnerLineId(); //审核通过 if ("FINISHED".equals(request.getInstanceStatus())) { //更新面试状态 @@ -257,6 +262,11 @@ public class FlowServiceImpl implements FlowService { // TODO 4. 修改流程状态到下一阶段 4 分配选址开发经理 //审核未通过 } else if ("CANCELED".equals(request.getInstanceStatus())) { + CloseFollowRequest closeFollowRequest = new CloseFollowRequest(); + closeFollowRequest.setRejectRealReason("资质审核流程拒绝"); + closeFollowRequest.setLineId(partnerLineId); + closeFollowRequest.setType("reject"); + hyPartnerLineInfoService.closeOrPassFollow(null,closeFollowRequest); interviewDAO.updateInterviewWorkflowStatus(interviewPlanId, WorkflowStatusEnum.INTERVIEW_7); } } diff --git a/coolstore-partner-service/src/main/java/com/cool/store/service/impl/HyPartnerLineInfoServiceImpl.java b/coolstore-partner-service/src/main/java/com/cool/store/service/impl/HyPartnerLineInfoServiceImpl.java index b332b2ea9..74d47aa26 100644 --- a/coolstore-partner-service/src/main/java/com/cool/store/service/impl/HyPartnerLineInfoServiceImpl.java +++ b/coolstore-partner-service/src/main/java/com/cool/store/service/impl/HyPartnerLineInfoServiceImpl.java @@ -322,6 +322,11 @@ public class HyPartnerLineInfoServiceImpl implements HyPartnerLineInfoService { @Override @Transactional(rollbackFor = Exception.class) public Boolean closeOrPassFollow(LoginUserInfo user,CloseFollowRequest closeFollowRequest) throws ApiException { + //该方法中user可能为空，注意处理空指针的情况 + if(user == null){ + user = new LoginUserInfo(); + } + HyPartnerLineInfoDO hyPartnerLineInfoDO = hyPartnerLineInfoDAO.selectByPrimaryKeySelective(closeFollowRequest.getLineId()); if (hyPartnerLineInfoDO==null){ throw new ServiceException(ErrorCodeEnum.LINE_ID_IS_NOT_EXIST); 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 81496a428..29db74404 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 @@ -37,7 +37,7 @@ public class FlowController { @PostMapping("/qualificationReview/callback") @ApiOperation("加盟商资质审核流程信息回调接口") - public ResponseResult qualificationCallback(@RequestBody QualificationCallbackReq request) { + public ResponseResult qualificationCallback(@RequestBody QualificationCallbackReq request) throws ApiException { flowService.qualificationCallback(request); return ResponseResult.success(); }