Merge branch 'dev/feat/partner1.6_20231226' into pre

coolstore-partner-dao/src/main/java/com/cool/store/dao/HyPartnerExhibitionDAO.java

@@ -170,4 +170,11 @@ public class HyPartnerExhibitionDAO {
         }
         hyPartnerExhibitionMapper.updateStatusAfterFinishInterview(Long.parseLong(interviewPlanId));
     }
+
+    public void updateStatusAfterSubmitQualification(String interviewPlanId) {
+        if (StringUtils.isEmpty(interviewPlanId)) {
+            return;
+        }
+        hyPartnerExhibitionMapper.updateStatusAfterSubmitQualification(Long.parseLong(interviewPlanId));
+    }
 }

coolstore-partner-dao/src/main/java/com/cool/store/mapper/HyPartnerExhibitionMapper.java

@@ -129,4 +129,11 @@ public interface HyPartnerExhibitionMapper  {
      * @return
      */
     int updateStatusAfterFinishInterview(@Param("interviewPlanId")Long interviewPlanId);
+
+    /**
+     * 资质审批通过后更新线索报名会销状态
+     * @param interviewPlanId
+     * @return
+     */
+    int updateStatusAfterSubmitQualification(@Param("interviewPlanId") Long interviewPlanId);
 }

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

@@ -519,4 +519,12 @@
       AND interview_plan_id = #{interviewPlanId}
   </update>
 
+  <update id="updateStatusAfterSubmitQualification">
+    UPDATE hy_partner_exhibition
+      SET participation_status = 5
+      WHERE deleted = 0
+      AND participation_status = 4
+      AND interview_plan_id = #{interviewPlanId}
+  </update>
+
 </mapper>

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

@@ -10,6 +10,7 @@ import com.cool.store.context.LoginUserInfo;
 import com.cool.store.dao.EnterpriseUserDAO;
 import com.cool.store.dao.HyInterviewDAO;
 import com.cool.store.dao.HyPartnerBaseInfoDAO;
+import com.cool.store.dao.HyPartnerExhibitionDAO;
 import com.cool.store.dto.log.CreateQualifyVerifyDTO;
 import com.cool.store.dto.log.LogBasicDTO;
 import com.cool.store.dto.response.DictResultDTO;
@@ -108,6 +109,9 @@ public class FlowServiceImpl implements FlowService {
     @Autowired
     private MDMHttpRequest mdmHttpRequest;
 
+    @Autowired
+    private HyPartnerExhibitionDAO hyPartnerExhibitionDAO;
+
     @Override
     @Transactional(rollbackFor = Exception.class)
     public void createQualifyVerify(CreateQualifyVerifyReq request) throws ApiException, IOException {
@@ -233,7 +237,8 @@ public class FlowServiceImpl implements FlowService {
             hyPartnerLineInfoDO.setDevelopmentDirector(request.getDevtDirectorId());
             hyPartnerLineInfoMapper.updateByPrimaryKeySelective(hyPartnerLineInfoDO);
         }
-        //3. 生成通过函并修改数据库相关信息
+
+        //5. 生成通过函并修改数据库相关信息
         String verifyCity = hyPartnerInterviewMapper.getVerifyCityByInterviewId(request.getInterviewId());
         String[] split = verifyCity.split("/");
         //根据长度来取市级行政区域
@@ -257,15 +262,18 @@ public class FlowServiceImpl implements FlowService {
         //记录日志
         CreateQualifyVerifyDTO log = CreateQualifyVerifyDTO.builder().mobile(operator.getMobile()).operateUserId(operator.getUserId()).operateUsername(operator.getName()).operateTime(DateUtil.format(new Date(), CoolDateUtils.DATE_FORMAT_SEC))
                 .summary(request.getSummary()).qualiVerifyContent(JSON.toJSONString(partnerCertificationInfoDO)).build();
-        //是否由会销发起面试
+        //是否由会销发起
         if (request.getWhetherExhibition() == null || Boolean.FALSE.equals(request.getWhetherExhibition())) {
             logService.recordBizLog(operator,hyPartnerInterviewDO.getPartnerLineId(), OperateTypeEnum.CREATE_QUALIFYVERIFY, log);
         } else {
+            //更新线索报名会销状态
+            hyPartnerExhibitionDAO.updateStatusAfterSubmitQualification(request.getInterviewPlanId());
             logService.recordBizLog(operator,hyPartnerInterviewDO.getPartnerLineId(), OperateTypeEnum.EXHIBITION_CREATE_QUALIFYVERIFY, log);
         }
     }
 
     @Override
+    @Transactional
     public void qualificationCallback(QualificationCallbackReq request) throws ApiException {
         log.info("MDM800审批成功回调，request{}", JSONObject.toJSONString(request));
         //1. 信息是否完整
@@ -289,7 +297,7 @@ public class FlowServiceImpl implements FlowService {
             // TODO pass_reason 暂无
             //将通过时间修改为本系统处理回调的时间，不以 request 的 modifiedTime 为准（有误）
             Date passDate = new Date();
-             //4. 向面试稽核表中新增一条信息
+            //4. 向面试稽核表中新增一条信息
             HyInspectionDO hyInspectionDO = new HyInspectionDO();
             hyInspectionDO.setInterviewPlanId(Long.parseLong(interviewPlanId));
             hyInspectionDO.setCreateTime(DateUtil.formatDateTime(passDate));