From de7f47e8319c66d25fb94049de1f4b75bf4f0339 Mon Sep 17 00:00:00 2001
From: pserimal <fengli@hsayi.com>
Date: Wed, 28 Jun 2023 14:08:21 +0800
Subject: [PATCH] =?UTF-8?q?=E5=8F=91=E8=B5=B7=E8=B5=84=E8=B4=A8=E5=AE=A1?=
 =?UTF-8?q?=E6=A0=B8=E7=BB=86=E8=8A=82=E9=97=AE=E9=A2=98=E4=BF=AE=E6=94=B9?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

---
 .../request/RpcCreateQualifyVerifyReq.java    |  6 +++++
 .../store/service/impl/FlowServiceImpl.java   | 25 ++++++++++++++-----
 2 files changed, 25 insertions(+), 6 deletions(-)

diff --git a/coolstore-partner-model/src/main/java/com/cool/store/request/RpcCreateQualifyVerifyReq.java b/coolstore-partner-model/src/main/java/com/cool/store/request/RpcCreateQualifyVerifyReq.java
index a56dde190..b572000fd 100644
--- a/coolstore-partner-model/src/main/java/com/cool/store/request/RpcCreateQualifyVerifyReq.java
+++ b/coolstore-partner-model/src/main/java/com/cool/store/request/RpcCreateQualifyVerifyReq.java
@@ -100,6 +100,12 @@ public class RpcCreateQualifyVerifyReq {
         @ApiModelProperty(value = "实控人手机号", required = true)
         private String skrPhone;
 
+        @ApiModelProperty("客户/招商经理钉钉id")
+        private String userCustDingUserId;
+
+        @ApiModelProperty("选址开发主管钉钉id")
+        private String userSiteDevDingUserId;
+
     }
 
     @ApiModelProperty(value = "数据体", required = true)
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 2ca0239f1..087e581bd 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
@@ -99,7 +99,7 @@ public class FlowServiceImpl implements FlowService {
             throw new ServiceException(ErrorCodeEnum.INTERVIEW_NOT_EXIST);
         }
         //根据面试状态限制
-        if (hyPartnerInterviewDO.getStatus().equals(Integer.parseInt(WorkflowStatusEnum.INTERVIEW_4.getCode()))) {
+        if (!hyPartnerInterviewDO.getStatus().equals(Integer.parseInt(WorkflowStatusEnum.INTERVIEW_4.getCode()))) {
             throw new ApiException(ErrorCodeEnum.INTERVIEW_STATUS_ERROR);
         }
         //1.发起加盟商资质审核
@@ -139,10 +139,13 @@ public class FlowServiceImpl implements FlowService {
             HyPartnerLineInfoDO hyPartnerLineInfoDO = hyPartnerLineInfoMapper.selectByPrimaryKeySelective(Long.valueOf(request.getLineId()));
             if (!Objects.isNull(hyPartnerLineInfoDO)) {
                 String investmentManagerId = hyPartnerLineInfoDO.getInvestmentManager();
-                EnterpriseUserDO enterpriseUserDO = enterpriseUserDAO.getUserInfoById(investmentManagerId);
-                if (!Objects.isNull(enterpriseUserDO)) {
-                    String jobNumber = enterpriseUserDO.getJobnumber();
-                    String mobile = enterpriseUserDO.getMobile();
+                String developmentDirectorId = hyPartnerLineInfoDO.getDevelopmentDirector();
+                EnterpriseUserDO investmentManager = enterpriseUserDAO.getUserInfoById(investmentManagerId);
+                EnterpriseUserDO developmentDirector = enterpriseUserDAO.getUserInfoById(developmentDirectorId);
+                //招商经理信息（客户经理）
+                if (!Objects.isNull(investmentManager)) {
+                    String jobNumber = investmentManager.getJobnumber();
+                    String mobile = investmentManager.getMobile();
                     DingdingUserDO dingdingUserDO = dingdingUserMapper.selectDingDingUserByMobile(mobile);
                     if (Objects.isNull(dingdingUserDO)) {
                         throw new ServiceException(ErrorCodeEnum.DINGDING_USER_NOT_EXIST);
@@ -150,6 +153,16 @@ public class FlowServiceImpl implements FlowService {
                     rpcRequest.setDingUserId(dingdingUserDO.getUserid());
                     authCode = generateAuthCode(jobNumber);
                     rpcRequest.getData().setAuthCode(authCode);
+                    rpcRequest.getData().setUserCustDingUserId(dingdingUserDO.getUserid());
+                }
+                //开发主管信息
+                if (!Objects.isNull(developmentDirector)) {
+                    String mobile = developmentDirector.getMobile();
+                    DingdingUserDO dingdingUserDO = dingdingUserMapper.selectDingDingUserByMobile(mobile);
+                    if (Objects.isNull(dingdingUserDO)) {
+                        throw new ServiceException(ErrorCodeEnum.DINGDING_USER_NOT_EXIST);
+                    }
+                    rpcRequest.getData().setUserSiteDevDingUserId(dingdingUserDO.getUserid());
                 }
             }
 
@@ -281,7 +294,7 @@ public class FlowServiceImpl implements FlowService {
                 param.add("file", resource);
                 //上传文件
                 responseEntity = RestTemplateUtil.post(url, headers, param, MDMResultDTO.class);
-                log.info("url:{}, header:{}, request:{} response statusCode:{}", url, JSONObject.toJSONString(headers), JSONObject.toJSONString(param, SerializerFeature.IgnoreErrorGetter), JSONObject.toJSONString(responseEntity.getStatusCode()));
+                log.info("url:{}, header:{}, response statusCode:{}", url, JSONObject.toJSONString(headers), JSONObject.toJSONString(responseEntity.getStatusCode()));
                 Map<String, String> data = (Map<String, String>) responseEntity.getBody().getData();
                 SkrRelshipProve skrRelshipProve= BeanUtil.fillBeanWithMap(data, new SkrRelshipProve(), false);
                 relshipProves.add(skrRelshipProve);