From b0e649d8b996e1b1f2b795c7c85a71f6067da304 Mon Sep 17 00:00:00 2001
From: pserimal <fengli@hsayi.com>
Date: Wed, 28 Jun 2023 13:29:48 +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=E5=AE=8C=E5=96=84MDM=E8=B0=83=E7=94=A8=E5=8F=8A?=
 =?UTF-8?q?=E6=95=B0=E6=8D=AE=E6=A0=BC=E5=BC=8F?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

---
 .../HyPartnerCertificationInfoMapper.xml      | 12 +++++++++
 .../store/service/impl/FlowServiceImpl.java   | 25 ++++++++++++-------
 2 files changed, 28 insertions(+), 9 deletions(-)

diff --git a/coolstore-partner-dao/src/main/resources/mapper/HyPartnerCertificationInfoMapper.xml b/coolstore-partner-dao/src/main/resources/mapper/HyPartnerCertificationInfoMapper.xml
index ac4c6dc15..0d536c97b 100644
--- a/coolstore-partner-dao/src/main/resources/mapper/HyPartnerCertificationInfoMapper.xml
+++ b/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>
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 6cd828a13..2ca0239f1 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
@@ -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);
-        dataBody.setIntendedSignDate(request.getWantSignTime());
+        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());
@@ -157,7 +170,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 +191,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);
@@ -284,7 +292,6 @@ public class FlowServiceImpl implements FlowService {
                 outputStream.close();
             }
         }
-
         return relshipProves;
     }