Merge remote-tracking branch 'origin/cc_20230520_partner' into cc_20230520_partner

coolstore-partner-common/src/main/java/com/cool/store/enums/ErrorCodeEnum.java

@@ -46,6 +46,7 @@ public enum ErrorCodeEnum {
     GET_INFO_ERROR(1021078, "获取信息异常", null),
     GET_PHONENUMBER_INFO_ERROR(1021079, "手机号归属地获取异常", null),
     IDENTITY_CARD_PARSE_FAIL(1021080, "身份证解析失败", null),
+    WECHAT_BIND_OTHER_MOBILE(1021081, "该微信已绑定其它手机号，请核对", null),
     PARAMS_REQUIRED(400002, "参数缺失！", null),
     DATA_CONVERT_ERROR(400002, "日期转换异常！", null),
     PARENT_NODE_NOT_EXIST(400002, "父节点不存在", null),

coolstore-partner-dao/src/main/resources/mapper/HyPartnerCertificationInfoMapper.xml

@@ -45,6 +45,12 @@
       <if test="record.partnership != null">
         partnership,
       </if>
+      <if test="record.qualifyVerifyId != null">
+        qualify_verify_id,
+      </if>
+      <if test="record.intentionContractNo != null">
+        intention_contract_no,
+      </if>
       <if test="record.wantSignTime != null">
         want_sign_time,
       </if>
@@ -104,6 +110,12 @@
       <if test="record.partnership != null">
         #{record.partnership},
       </if>
+      <if test="record.qualifyVerifyId != null">
+        #{record.qualifyVerifyId},
+      </if>
+      <if test="record.intentionContractNo != null">
+        #{record.intentionContractNo},
+      </if>
       <if test="record.wantSignTime != null">
         #{record.wantSignTime},
       </if>

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)

coolstore-partner-service/src/main/java/com/cool/store/service/impl/FlowServiceImpl.java

@@ -93,6 +93,15 @@ public class FlowServiceImpl implements FlowService {
     @Override
     @Transactional
     public void createQualifyVerify(CreateQualifyVerifyReq request) throws ApiException, IOException {
+        //根据面试id获取面试信息
+        HyPartnerInterviewDO hyPartnerInterviewDO = hyPartnerInterviewMapper.selectByPrimaryKeySelective(request.getInterviewId());
+        if (Objects.isNull(hyPartnerInterviewDO)) {
+            throw new ServiceException(ErrorCodeEnum.INTERVIEW_NOT_EXIST);
+        }
+        //根据面试状态限制
+        if (!hyPartnerInterviewDO.getStatus().equals(Integer.parseInt(WorkflowStatusEnum.INTERVIEW_4.getCode()))) {
+            throw new ApiException(ErrorCodeEnum.INTERVIEW_STATUS_ERROR);
+        }
         //1.发起加盟商资质审核
         RpcCreateQualifyVerifyReq rpcRequest = new RpcCreateQualifyVerifyReq();
         RpcCreateQualifyVerifyReq.Data dataBody = new RpcCreateQualifyVerifyReq().new Data();
@@ -101,8 +110,12 @@ public class FlowServiceImpl implements FlowService {
         fraSource.setText("沪上阿姨合伙人");
         dataBody.setFraSource(fraSource);
         //copy properties
-        BeanUtil.copyProperties(request, rpcRequest);
+        BeanUtil.copyProperties(request, dataBody);
+        //日期格式问题
+        if (request.getWantSignTime().endsWith("00:00:00")) {
             dataBody.setIntendedSignDate(request.getWantSignTime());
+        }
+        dataBody.setIntendedSignDate(request.getWantSignTime() + " 00:00:00");
         dataBody.setAmtDeposit(request.getSecurityFund());
         dataBody.setIntendedSigner(request.getIntentionSignerUsername());
         dataBody.setIntendedSignerTel(request.getIntentionSignerMobile());
@@ -126,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);
+                String developmentDirectorId = hyPartnerLineInfoDO.getDevelopmentDirector();
-                if (!Objects.isNull(enterpriseUserDO)) {
+                EnterpriseUserDO investmentManager = enterpriseUserDAO.getUserInfoById(investmentManagerId);
-                    String jobNumber = enterpriseUserDO.getJobnumber();
+                EnterpriseUserDO developmentDirector = enterpriseUserDAO.getUserInfoById(developmentDirectorId);
-                    String mobile = enterpriseUserDO.getMobile();
+                //招商经理信息（客户经理）
+                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);
@@ -137,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());
                 }
             }
 
@@ -157,7 +183,6 @@ public class FlowServiceImpl implements FlowService {
         partnerCertificationInfoDO.setPartnerInterviewId(Long.valueOf(request.getInterviewId()));
         partnerCertificationInfoDO.setPartnership(String.valueOf(request.getPartnership()));
         partnerCertificationInfoDO.setWantSignTime(DateUtil.parse(request.getWantSignTime()));
-
         partnerCertificationInfoDO.setPartnerFee(request.getPartnerFee().toString());
         partnerCertificationInfoDO.setSecurityFund(request.getSecurityFund().toString());
         partnerCertificationInfoDO.setTechnicalServiceFee(request.getTechnicalServiceFee().toString());
@@ -179,14 +204,10 @@ public class FlowServiceImpl implements FlowService {
         hyPartnerCertificationInfoMapper.insertSelective(partnerCertificationInfoDO);
 
         //3.更新面试信息
-        //根据面试id获取面试信息
-        HyPartnerInterviewDO hyPartnerInterviewDO = hyPartnerInterviewMapper.selectByPrimaryKeySelective(request.getInterviewId());
-        if (Objects.isNull(hyPartnerInterviewDO)) {
-            throw new ServiceException(ErrorCodeEnum.INTERVIEW_NOT_EXIST);
-        }
         hyPartnerInterviewDO.setUpdateTime(new Date());
         //更新面试信息
         //更新面试状态
+        hyPartnerInterviewDO.setStatus(null);
         interviewDAO.updateInterviewWorkflowStatus(request.getInterviewPlanId(), WorkflowStatusEnum.INTERVIEW_5);
         hyPartnerInterviewDO.setAuthCode(authCode);
         hyPartnerInterviewMapper.updateByPrimaryKeySelective(hyPartnerInterviewDO);
@@ -273,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);
@@ -284,7 +305,6 @@ public class FlowServiceImpl implements FlowService {
                 outputStream.close();
             }
         }
-
         return relshipProves;
     }
 

coolstore-partner-service/src/main/java/com/cool/store/service/impl/HyPartnerIntentInfoServiceImpl.java

@@ -346,7 +346,8 @@ public class HyPartnerIntentInfoServiceImpl implements HyPartnerIntentInfoServic
         intentInfoDO.setWantShopArea(request.getWantShopArea());
         intentInfoDO.setAcceptAdjustType(request.getAcceptAdjustType());
         intentInfoDO.setIsHaveWantShop(request.getIsHaveWantShop());
-        if (CollectionUtils.isNotEmpty(request.getWantShopInfo())){
+        intentInfoDO.setWantShopInfo("");
+        if (CollectionUtils.isNotEmpty(request.getWantShopInfo()) && request.getIsHaveWantShop() == 1){
             intentInfoDO.setWantShopInfo(JSONObject.toJSONString(request.getWantShopInfo()));
         }
         intentInfoDO.setMaxBudget(request.getMaxBudget());

coolstore-partner-service/src/main/java/com/cool/store/service/impl/WechatMiniAppServiceImpl.java

@@ -113,6 +113,9 @@ public class WechatMiniAppServiceImpl implements WechatMiniAppService {
             }else {
                 hyPartnerUserInfoDO = hyPartnerUserInfoDAO.selectByPartnerId(hyPartnerUserPlatformBindDO.getPartnerId());
             }
+            if(!hyPartnerUserInfoDO.getMobile().equals(phoneInfoDTO.getPhoneInfo().getPhoneNumber())){
+                throw new ServiceException(ErrorCodeEnum.WECHAT_BIND_OTHER_MOBILE);
+            }
             BeanUtil.copyProperties(hyPartnerUserInfoDO, userInfoVO);
             HyPartnerLineInfoDO lineInfoDO = hyPartnerLineInfoDAO.getByPartnerId(hyPartnerUserInfoDO.getPartnerId());
             if (lineInfoDO != null){