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

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

@@ -114,4 +114,8 @@ public class CommonConstants {
     public static  final  String FOLLOW = "follow";
     public static final  String PENDING = "pending";
 
+    public static  final String ALLOCATION = "allocation";
+
+    public static  final  String TRANSFER = "transfer";
+
 }

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

@@ -8,8 +8,8 @@ package com.cool.store.enums;
  */
 public enum DataSourceEnum {
 
-    SYNC(0, "同步"),
-    CREATE(1, "创建");
+    SYNC(0, "EC同步"),
+    CREATE(1, "小程序创建");
 
     private Integer code;
 

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

@@ -44,19 +44,22 @@ public enum ErrorCodeEnum {
     USER_GROUP_NAME_EXIST(1021076, "用户分组名称已存在", null),
     USER_GROUP_NOT_EXIST(1021077, "用户分组不存在", null),
     GET_INFO_ERROR(1021078, "获取信息异常", null),
-
-
-
-
+    GET_PHONENUMBER_INFO_ERROR(1021079, "手机号归属地获取异常", null),
+    IDENTITY_CARD_PARSE_FAIL(1021080, "身份证解析失败", null),
     PARAMS_REQUIRED(400002, "参数缺失！", null),
+    DATA_CONVERT_ERROR(400002, "日期转换异常！", null),
 
 
     LINE_ID_IS_NOT_EXIST(500001, "线索ID不存在！", null),
     WORK_FLOW_STAGE_PASS_ERROR(500002, "通过错误，非对应阶段！", null),
     PARTNER_USER_NOT_EXIST(500003, "加盟商用户信息不存在！", null),
     ZONE_NOT_EXIST(500004, "战区不存在！", null),
+    PARTNER_BASEINFO_NOT_EXIST(500005, "基本信息不存在！", null),
+    INTENT_INFO_NOT_EXIST(500006, "意向信息不存在！", null),
 
     INTERVIEW_ENTER_FAIL(1021101, "进入面试间失败", null),
+    DINGDING_USER_NOT_EXIST(1021102, "用户钉钉信息不存在，无法发起资质审核！", null),
+    INTERVIEW_NOT_EXIST(1021103, "面试信息不存在！", null),
 
     SIGN_FAIL(600000, "验签失败", null),
     GET_ACCESSTOKEN_ERROR(600001, "获取小程序TOKEN错误！", null),

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

@@ -0,0 +1,49 @@
+package com.cool.store.enums;
+
+/**
+ * @author zhangchenbiao
+ * @FileName: MessageTypeEnum
+ * @Description:
+ * @date 2023-06-15 10:14
+ */
+public enum MessageTypeEnum {
+
+    SCHEDULE_REMINDER("schedule_reminder", "日历提醒事件", "img_v2_0709ece3-77a8-49a4-820f-f245b2a4fdag")
+
+
+
+    ;
+
+    private String code;
+
+    private String name;
+
+    private String imageMediaId;
+
+    MessageTypeEnum(String code, String name, String imageMediaId) {
+        this.code = code;
+        this.name = name;
+        this.imageMediaId = imageMediaId;
+    }
+
+    public String getCode() {
+        return code;
+    }
+
+    public String getName() {
+        return name;
+    }
+
+    public String getImageMediaId() {
+        return imageMediaId;
+    }
+
+    public static String getImageMediaId(String code){
+        for (MessageTypeEnum value : MessageTypeEnum.values()) {
+            if(value.code.equals(code)){
+                return value.imageMediaId;
+            }
+        }
+        return null;
+    }
+}

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

@@ -30,7 +30,7 @@ public enum RocketMqGroupEnum {
     /**
      * 事件消息监听
      */
-    FEI_SHU_EVENT_LISTENER("fei_shu_event_listener", new ArrayList<>(Arrays.asList(RocketMqTagEnum.USER_EVENT, RocketMqTagEnum.AUTH_SCOPE_CHANGE))),
+    FEI_SHU_EVENT_LISTENER("fei_shu_event_listener", new ArrayList<>(Arrays.asList(RocketMqTagEnum.USER_EVENT, RocketMqTagEnum.AUTH_SCOPE_CHANGE, RocketMqTagEnum.DEPT_EVENT))),
 
     ;
 

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

@@ -13,6 +13,7 @@ public enum RocketMqTagEnum {
 
     AUTH_SCOPE_CHANGE("auth_scope_change","授权范围变更"),
     USER_EVENT("user_event","钉钉通讯录变更事件"),
+    DEPT_EVENT("dept_event","部门事件"),
     ;
 
 

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

@@ -171,4 +171,8 @@ public class RedisUtil {
     public void delete(String key) {
         redisTemplate.delete(key);
     }
+
+    public Long increment(String key) {
+        return redisTemplate.boundValueOps(key).increment(1L);
+    }
 }