Merge branch 'master' into cc_2250513_api

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

@@ -18,6 +18,9 @@ public enum FileTypeEnum {
     EXPORT_FINANCE("exportFinance","财务导出"),
     EXPORT_JOIN_SHOP("exportJoinShop","加盟开店申请"),
     EXPORT_PROGRESS("exportProgress","进度确认"),
+    IMPORT_OA_OLD_SHOP_DATA_ERROR("OaOldShopDataError", "导入OA旧数据错误列表"),
+    IMPORT_OA_OLD_SHOP_DATA("importOaOldShopData", "导入OA旧数据"),
+
     ;
     private String fileType;
     private String desc;

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

@@ -0,0 +1,48 @@
+package com.cool.store.enums;
+
+/**
+ * @author 邵凌志
+ * @date 2020/12/11 18:11
+ */
+public enum ImportTaskStatusEnum {
+
+
+    SUCCESS(2, "上传成功"),
+
+    PROGRESS(1, "进行中"),
+
+    ERROR(3, "上传失败"),
+
+    PART_ERROR(4, "上传部分失败"),
+    ;
+    /**
+     * 返回码
+     */
+    private int code;
+
+    /**
+     * 返回信息
+     */
+    private String msg;
+
+    ImportTaskStatusEnum(int code, String message) {
+        this.code = code;
+        this.msg = message;
+    }
+
+    public int getCode() {
+        return code;
+    }
+
+    private void setCode(int code) {
+        this.code = code;
+    }
+
+    public String getMsg() {
+        return msg;
+    }
+
+    private void setMsg(String message) {
+        this.msg = message;
+    }
+}

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

@@ -10,7 +10,8 @@ public enum JoinModeEnum {
     FRANCHISE_DEPARTMENT(1,"加盟部加盟店"),
     FRANCHISE_COMPANIES(2,"加盟公司加盟店"),
     OWN_STORE(3,"加盟公司自有店"),
-    STRONG_FRANCHISE(4,"强加盟");
+    STRONG_FRANCHISE(4,"强加盟")
+    ;
     private int code;
     private String desc;
     private JoinModeEnum(int code, String desc) {