Merge remote-tracking branch 'hs/dev/feat/partner1.3_20230828' into dev/feat/partner1.3_20230828

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

@@ -0,0 +1,25 @@
+package com.cool.store.enums;
+
+public enum CallStatusEnum {
+
+    PENDING_CALL(0, "待呼叫"),
+    CALL_ANSWERED(1, "呼叫接听"),
+    CALL_MISSED(2, "呼叫未接听"),
+    CALL_FAILED(3, "呼叫失败");
+
+    private final int code;
+    private final String message;
+
+    CallStatusEnum(int code, String message) {
+        this.code = code;
+        this.message = message;
+    }
+
+    public int getCode() {
+        return code;
+    }
+
+    public String getMessage() {
+        return message;
+    }
+}

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

@@ -80,6 +80,11 @@ public enum ErrorCodeEnum {
     INTERVIEW_INTERVIEW_TIME_IS_UNUSABLE(1021114, "当前预约时间不可用，请和线索用户协商其他时间后确定预约时间\n面试人：{0} 手机号：{1}", null),
     INTERVIEW_PARTNER_NOT_EXIST(1021115, "线索下的加盟商不存在！", null),
     ROOM_STATUS_ERROR(10211156, "当前面试房间状态不允许进行该操作！", null),
+    MOBILE_APP_NOT_ONLINE_ERROR(10211157, "拨出手机APP不在线！", null),
+    CALL_RECORD_NOT_EXIST_ERROR(10211158, "通话记录不存在！", null),
+
+    CREATE_CALL_REQUEST_ERROR(10211158, "创建电话请求失败！", null),
+    CALL_UP_ERROR(10211159, "拨出电话异常！", null),
     CONTENT_DUPLICATED(10211200, "动态标题重复！", null),
     SIGN_FAIL(600000, "验签失败", null),
     GET_ACCESSTOKEN_ERROR(600001, "获取小程序TOKEN错误！", null),
@@ -88,7 +93,11 @@ public enum ErrorCodeEnum {
     INSPECTION_INFO_NOT_EXIST(600005, "稽核信息不存在！", null),
     OPEN_AREA_NULL(600006,"归属地区不能为空",null),
 
-    OUTBOUND_NUMBER_EXIST(110001, "手机号已存在！", null);
+    OUTBOUND_NUMBER_EXIST(110001, "该呼出号码已被绑定，请更改后重试", null),
+
+    LABEL_GROUP_IN_USE(120001, "该标签组下存在标签，不可删除；请确保该标签组下标签数量为0后再进行删除", null),
+    LABEL_GROUP_EXIST(120002, "该标签组已存在，请重新输入", null),
+    LABEL_EXIST(120003, "该标签已存在，请重新输入", null),
     ;