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

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

@@ -1,7 +1,6 @@
 package com.cool.store.enums;
 
 import com.cool.store.constants.CommonConstants;
-import org.apache.commons.collections4.ListUtils;
 import org.apache.commons.lang3.tuple.Pair;
 
 import java.time.LocalDate;
@@ -9,7 +8,6 @@ import java.time.LocalDateTime;
 import java.time.LocalTime;
 import java.util.ArrayList;
 import java.util.List;
-import java.util.Map;
 
 /**
  * @author zhangchenbiao
@@ -93,8 +91,4 @@ public enum InterviewTypeEnum {
         return result;
     }
 
-    public static void main(String[] args) {
-        System.out.println(getTimeSlots(LocalDate.now(), InterviewTypeEnum.INTERVIEW));
-    }
-
 }

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

@@ -0,0 +1,23 @@
+package com.cool.store.enums;
+
+/**
+ * @author zhangchenbiao
+ * @FileName: InterviewUserTypeEnum
+ * @Description:
+ * @date 2024-03-20 9:53
+ */
+public enum InterviewUserTypeEnum {
+
+    LINE("加盟商线索"),
+    INTERVIEWER("面试官"),;
+
+    private String message;
+
+    InterviewUserTypeEnum(String message) {
+        this.message = message;
+    }
+
+    public String getMessage() {
+        return message;
+    }
+}

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

@@ -0,0 +1,45 @@
+package com.cool.store.enums;
+
+/**
+ * @author zhangchenbiao
+ * @FileName: JoinInterviewStatusEnum
+ * @Description:
+ * @date 2024-03-20 11:05
+ */
+public enum JoinInterviewStatusEnum {
+
+    NO_JOIN(0, "未参加"),
+    LINE_JOIN(1,"加盟商先进入"),
+    INTERVIEW_JOIN(2,"面试官先进入"),
+    JOIN(3,"双方都参加");
+
+    private Integer code;
+
+    private String message;
+
+    JoinInterviewStatusEnum(Integer code, String message) {
+        this.code = code;
+        this.message = message;
+    }
+
+    public Integer getCode() {
+        return code;
+    }
+
+    public String getMessage() {
+        return message;
+    }
+
+    public static Integer getJoinInterviewStatus(Integer joinInterviewStatus, InterviewUserTypeEnum userType){
+        if(NO_JOIN.getCode().equals(joinInterviewStatus)){
+            return InterviewUserTypeEnum.LINE.equals(userType) ? LINE_JOIN.getCode() : INTERVIEW_JOIN.getCode();
+        }
+        if(LINE_JOIN.getCode().equals(joinInterviewStatus)){
+            return InterviewUserTypeEnum.LINE.equals(userType) ? LINE_JOIN.getCode() : JOIN.getCode();
+        }
+        if(INTERVIEW_JOIN.getCode().equals(joinInterviewStatus)){
+            return InterviewUserTypeEnum.LINE.equals(userType) ? JOIN.getCode() : INTERVIEW_JOIN.getCode();
+        }
+        return JOIN.getCode();
+    }
+}

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

@@ -1,51 +0,0 @@
-package com.cool.store.enums;
-
-/**
- * @Author suzhuhong
- * @Date 2023/6/9 16:35
- * @Version 1.0
- */
-public enum WorkflowStatusEnum {
-    //意向申请阶段
-    INTENT_0("0","待提交"),
-    INTENT_1("1","待审核"),
-    INTENT_2("2","已通过"),
-    INTENT_3("3","未通过"),
-
-    //预约面试阶段
-    RESERVATION_0("0","待预约"),
-    RESERVATION_1("1","待审核"),
-    RESERVATION_7("7","拒绝"),
-    RESERVATION_8("8","超时"),//超时未预约或未参加
-
-
-    //合格资格面试
-    INTERVIEW_2("2","待面试"),
-    INTERVIEW_3("3","已开始"),
-    INTERVIEW_4("4","待审核"),
-    INTERVIEW_5("5","审核中"),
-    INTERVIEW_6("6","审核通过"),
-    INTERVIEW_7("7","拒绝"),
-
-
-    ;
-
-    private String code;
-
-    private String message;
-
-    WorkflowStatusEnum(String code, String message) {
-        this.code = code;
-        this.message = message;
-    }
-
-
-    public String getCode() {
-        return code;
-    }
-
-    public String getMessage() {
-        return message;
-    }
-
-}

coolstore-partner-common/src/main/java/com/cool/store/utils/TRTCUtils.java

@@ -16,10 +16,10 @@ public class TRTCUtils {
      */
     private static final Long expired = 60 * 60 * 24L;
 
-    @Value("${trtc.sdkAppId:null}")
+    @Value("${trtc.sdkAppId}")
     private Long sdkAppId;
 
-    @Value("${trtc.secretKey:null}")
+    @Value("${trtc.secretKey}")
     private String key;
 
     /**