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

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

@@ -386,6 +386,7 @@
            hpll.id          as partnerLineId,
            hpci.qualify_verify_id as qualifyVerifyId,
            hpci.intention_contract_no as intentionContractNo,
+           hpll.workflow_stage as workflowStage,
            hpi.pass_time    as passTime,
            hpi.pass_reason  as passReason,
            hpi.recorder     as recorderId,

coolstore-partner-model/src/main/java/com/cool/store/vo/interview/InterviewVO.java

@@ -25,6 +25,9 @@ public class InterviewVO {
     @ApiModelProperty(value = "线索id", required = true)
     private Long partnerLineId;
 
+    @ApiModelProperty(value = "线索状态")
+    private Long workflowStage;
+
     @ApiModelProperty("资质审核流程id")
     private String qualifyVerifyId;
 

coolstore-partner-service/src/main/java/com/cool/store/job/JobHandler.java

@@ -76,5 +76,17 @@ public class JobHandler {
         }
     }
 
+    @XxlJob("approvalReminder")
+    public void approvalReminder(){
+        try {
+            log.info("审批即将超时提醒开始");
+            hyPartnerInterviewPlanService.approvalReminder();
+            log.info("审批即将超时提醒结束");
+            XxlJobHelper.handleSuccess();
+        }catch (Exception e){
+            log.error("审批即将超时提醒定时任务异常",e);
+            XxlJobHelper.log("审批即将超时提醒定时任务异常"+e.getMessage());
+        }
+    }
 
 }

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

@@ -62,4 +62,5 @@ public interface HyPartnerInterviewPlanService {
      * @return
      */
     void updateAbsentInterview() throws ApiException;
+    void approvalReminder() throws ApiException;
 }

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

@@ -184,13 +184,16 @@ public class HyPartnerIntentInfoServiceImpl implements HyPartnerIntentInfoServic
             hyPartnerUserInfoDAO.updateByPrimaryKeySelective(hyPartnerUserInfoDO);
             // 更新线索状态和招商经理
             HyPartnerLineInfoDO hyPartnerLineInfoDO = hyPartnerLineInfoDAO.selectByPrimaryKeySelective(request.getPartnerLineId());
-            Boolean flag = hyPartnerLineInfoService.assignFollowUser(request.getPartnerId(), request.getWantShopArea(), request.getAcceptAdjustType());
+            //是公海线索 才会修改线索状态与招商经理
-            hyPartnerLineInfoDO.setLineStatus(flag ? LineStatusEnum.PRIVATE_SEAS.getCode() : LineStatusEnum.PUBLIC_SEAS.getCode());
+            if (LineStatusEnum.PUBLIC_SEAS.getCode().equals(hyPartnerLineInfoDO.getLineStatus())){
-            if (flag){
+                Boolean flag = hyPartnerLineInfoService.assignFollowUser(request.getPartnerId(), request.getWantShopArea(), request.getAcceptAdjustType());
-                String investmentManager = hyPartnerLineInfoService.getAssignFollowUser(request.getPartnerId(), "intent");
+                hyPartnerLineInfoDO.setLineStatus(flag ? LineStatusEnum.PRIVATE_SEAS.getCode() : LineStatusEnum.PUBLIC_SEAS.getCode());
-                hyPartnerLineInfoDO.setInvestmentManager(investmentManager);
+                if (flag){
+                    String investmentManager = hyPartnerLineInfoService.getAssignFollowUser(request.getPartnerId(), "intent");
+                    hyPartnerLineInfoDO.setInvestmentManager(investmentManager);
+                }
+                hyPartnerLineInfoDAO.updateByPrimaryKeySelective(hyPartnerLineInfoDO);
             }
-            hyPartnerLineInfoDAO.updateByPrimaryKeySelective(hyPartnerLineInfoDO);
         }
         if (StringUtil.isNotBlank(request.getWantShopArea())){
             HyOpenAreaInfoDO hyOpenAreaInfoDO = hyOpenAreaInfoDAO.selectById(Long.valueOf(request.getWantShopArea()));

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

@@ -221,6 +221,16 @@ public class HyPartnerInterviewPlanServiceImpl implements HyPartnerInterviewPlan
         handleOverTimeInterview(interviewBaseInfoList,"超时未面试");
     }
 
+    @Override
+    public void approvalReminder() throws ApiException {
+        //查询即将超时但未审批的面试
+        HyPartnerInterviewPlanDO hyPartnerInterviewPlanDO = new HyPartnerInterviewPlanDO();
+        hyPartnerInterviewPlanDO.setDeleted(Boolean.FALSE);
+        hyPartnerInterviewPlanDO.setApplicationApproved(0);
+//        hyPartnerInterviewPlanDO.setStartTime();
+        List<HyPartnerInterviewPlanDO> hyPartnerInterviewPlanDOS = hyPartnerInterviewPlanMapper.selectBySelective(hyPartnerInterviewPlanDO);
+    }
+
     /**
      * 统一处理面试超时情况，包括超时未预约和超时未面试
      * @param interviewBaseInfoList

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

@@ -587,6 +587,8 @@ public class InterviewServiceImpl implements InterviewService {
             //根据加盟商用户ID查询面试官ID
             HyPartnerInterviewPlanDO hyPartnerInterviewPlanDO = new HyPartnerInterviewPlanDO();
             hyPartnerInterviewPlanDO.setPartnerId(partnerId);
+            hyPartnerInterviewPlanDO.setPartnerLineId(Long.valueOf(lineId));
+            hyPartnerInterviewPlanDO.setDeleted(false);
             List<HyPartnerInterviewPlanDO> hyPartnerInterviewPlanDOS = hyPartnerInterviewPlanMapper.selectBySelective(hyPartnerInterviewPlanDO);
             //如果查询结果为空，则去线索中获取招商经理，面试官只有两个阶段，一个是在第一次申请时不存在面试安排直接取招商经理，第二个时面试信息中可修改面试官信息，这个时候以面试信息中为准
             if (CollectionUtils.isEmpty(hyPartnerInterviewPlanDOS)) {