Merge remote-tracking branch 'origin/dev/feat/partner1.1_20230727' into dev/feat/partner1.1_20230727

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

coolstore-partner-common/src/main/java/com/cool/store/constants/CommonConstants.java

@@ -12,7 +12,7 @@ public class CommonConstants {
 
     public static final String MESSAGE_ID = "messageId";
 
-    public static final String ACCESS_TOKEN_KEY = "access_token";
+    public static final String ACCESS_TOKEN_KEY = "access_token:{0}";
 
     public static final String REFRESH_TOKEN_KEY = "refresh_token";
 

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

@@ -82,6 +82,9 @@ public enum ErrorCodeEnum {
     SIGN_FAIL(600000, "验签失败", null),
     GET_ACCESSTOKEN_ERROR(600001, "获取小程序TOKEN错误！", null),
     NEW_MOBILE_HAS_EXIST(600002,"加盟商用户信息已存在",null),
+    INSPECTION_USER_OCCUPY(600002,"当前稽核人已经配置其他战区",null),
+    INSPECTION_INFO_NOT_EXIST(600005, "稽核信息不存在！", null),
+    OPEN_AREA_NULL(600006,"归属地区不能为空",null),
     ;
 
 

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

@@ -0,0 +1,33 @@
+package com.cool.store.enums;
+
+/**
+ * @author Fun Li
+ * @version 1.0
+ * @date 2023/7/19 17:55
+ */
+//稽核操作类型
+public enum InspectionOperationTypeEnum {
+
+    PASS(0, "合格"),
+    NOT_PASS(1, "不合格"),
+    REVOCATION(2, "撤销");
+
+    private Integer code;
+
+    private String type;
+
+    InspectionOperationTypeEnum(Integer code, String type) {
+        this.code = code;
+        this.type = type;
+    }
+
+    public Integer getCode() {
+        return code;
+    }
+
+    public String getType() {
+        return type;
+    }
+
+
+}

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

@@ -0,0 +1,32 @@
+package com.cool.store.enums;
+
+/**
+ * @author Fun Li
+ * @version 1.0
+ * @date 2023/7/19 17:22
+ */
+//稽核信息状态
+public enum InspectionStatusEnum {
+
+    NOT_INSPECT(0, "未稽核"),
+    PASS(1, "合格"),
+    NOT_PASS(2, "不合格");
+
+    private Integer code;
+
+    private String type;
+
+    InspectionStatusEnum(Integer code, String type) {
+        this.code = code;
+        this.type = type;
+    }
+
+    public Integer getCode() {
+        return code;
+    }
+
+    public String getType() {
+        return type;
+    }
+
+}

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

@@ -0,0 +1,29 @@
+package com.cool.store.enums;
+
+/**
+ * @author Fun Li
+ * @version 1.0
+ * @date 2023/7/19 17:16
+ */
+//稽核类型
+public enum InspectionTyeEnum {
+
+    INTERVIEW_INSPECTION(0, "面试稽核");
+
+    private Integer code;
+
+    private String type;
+
+    InspectionTyeEnum(Integer code, String type) {
+        this.code = code;
+        this.type = type;
+    }
+
+    public Integer getCode() {
+        return code;
+    }
+
+    public String getType() {
+        return type;
+    }
+}