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 @@
partnership,
+
+ qualify_verify_id,
+
+
+ intention_contract_no,
+
want_sign_time,
@@ -104,6 +110,12 @@
#{record.partnership},
+
+ #{record.qualifyVerifyId},
+
+
+ #{record.intentionContractNo},
+
#{record.wantSignTime},
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;
}