Merge remote-tracking branch 'xfsg/cc_partner_init' into cc_partner_init

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

@@ -6,6 +6,7 @@ package com.cool.store.enums;
  * @Description: 面试状态枚举
  */
 public enum InterviewStatusEnum {
+    // 0-待预约 1-待面审 2-待审核 3-审批通过 4-不通过
     WAIT_APPOINTMENT(0, "待预约"),
     WAIT_INTERVIEW(1, "待面审"),
     WAIT_AUDIT(2, "待审核"),

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

@@ -79,7 +79,7 @@ public enum WorkflowSubStageEnum{
                 break;
             case STORE_EXPERIENCE:
             case SECOND_INTERVIEWS:
-                this.nextStage = SECOND_INTERVIEWS;
+                this.nextStage = null;
                 break;
         }
         return nextStage;

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

@@ -31,13 +31,13 @@
     from
       xfsg_line_calendars_event
     where
-      ((start_time between #{startTime} and #{endTime}) or (end_time between #{startTime} and #{endTime}))
+      <![CDATA[((start_time > #{startTime} and start_time < #{endTime}) or (end_time > #{startTime} and end_time < #{endTime}))]]>
     and
       interview_type = #{interviewType}
     <if test="interviewType == 0">
       and interviewer_user_id = #{interviewerUserId}
     </if>
-    <if test="regionId == 1">
+    <if test="interviewType == 1 or interviewType == 2">
       and region_id = #{regionId}
     </if>
     <if test="excludeInterviewId != null">

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

@@ -385,8 +385,16 @@ public class LineInterviewServiceImpl extends LineFlowService implements LineInt
         updateInterviewInfo.setId(interviewInfo.getId());
         updateInterviewInfo.setAuditId(auditId);
         updateInterviewInfo.setInterviewStatus(InterviewStatusEnum.PASS.getCode());
-        //更新线索阶段
-        lineInfoDAO.updateWorkflowStage(lineInfo.getId(), nextStage, nextStage.getInitStatus());
+        if(WorkflowSubStageEnum.SECOND_INTERVIEWS.equals(workflowSubStageEnum)){
+            //更新线索阶段
+            lineInfoDAO.updateWorkflowStage(lineInfo.getId(), nextStage, nextStage.getInitStatus());
+        }else{
+            LineInfoDO updateLine = new LineInfoDO();
+            updateLine.setId(lineInfo.getId());
+            updateLine.setWorkflowStage(WorkflowStageEnum.STORE.getCode());
+            updateLine.setWorkflowSubStageStatus(WorkflowSubStageStatusEnum.SECOND_INTERVIEWS_125.getCode());
+            lineInfoDAO.updateLineInfo(updateLine);
+        }
         return lineInterviewDAO.updateInterviewInfo(updateInterviewInfo) > 0;
     }
 

coolstore-partner-web/src/main/java/com/cool/store/config/SignValidateFilter.java

@@ -57,7 +57,6 @@ public class SignValidateFilter implements Filter {
                     "/**/swagger*/**",
                     "/**/webjars/**",
                     "/xfsg/mini/program/v1/partnerManage/openArea/areaApplyQuery",
-                     "/xfsg/mini/**",
                     "/xfsg/*/api/audit/result"
 
             );

coolstore-partner-web/src/main/resources/application-test.properties

@@ -74,7 +74,7 @@ xxl.job.executor.ip =
 xxl.job.executor.port = 40001
 xxl.job.executor.logpath = logs/xxl-job/jobhandler
 xxl.job.executor.logretentiondays = 30
-xxl.job.accessToken =
+xxl.job.accessToken = 25365115eed84e9ba5e0040abb255a09
 
 exhibition.channel.id=52399
 recommended.channel.id=52400