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

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

@@ -0,0 +1,37 @@
+package com.cool.store.enums;
+
+/**
+ * @Author: WangShuo
+ * @Date: 2025/04/07/18:23
+ * @Version 1.0
+ * @注释:
+ */
+public enum BusinessModelEnum {
+    NULL(0, "无"),
+    DIRECT_SALES(1, "直营"),
+    JOIN_SALES(2, "加盟");
+
+    private Integer code;
+    private String desc;
+
+    BusinessModelEnum(Integer code, String desc) {
+        this.code = code;
+        this.desc = desc;
+    }
+
+    public Integer getCode() {
+        return code;
+    }
+
+    public void setCode(Integer code) {
+        this.code = code;
+    }
+
+    public String getDesc() {
+        return desc;
+    }
+
+    public void setDesc(String desc) {
+        this.desc = desc;
+    }
+}

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

@@ -0,0 +1,24 @@
+package com.cool.store.enums;
+
+/**
+ * @Author: WangShuo
+ * @Date: 2025/04/07/17:03
+ * @Version 1.0
+ * @注释:
+ */
+public enum DownSystemTypeEnum {
+    XGJ(1,"新管家"),
+    POS(2,"POS");
+    private Integer code;
+    private String desc;
+    DownSystemTypeEnum(Integer code,String desc){
+        this.code = code;
+        this.desc = desc;
+    }
+    public Integer getCode() {
+        return code;
+    }
+    public String getDesc() {
+        return desc;
+    }
+}

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

@@ -236,6 +236,7 @@ public enum ErrorCodeEnum {
     UPDATE_INVESTMENT_MANAGER_FAIL(131005,"当前用户已经为该门店招商经理",null),
     CONFIRM_THE_APPROVER(131006,"您提交的铺位暂时找不到选址审批人，请联系系统管理员配置选址审批权限后再提交铺位审批",null),
     CREATE_PASSWORD_FAIL(131007,"身份证号信息错误",null),
+    GET_HOME_TEMPLATE_ERROR(131008,"获取首页模板失败",null),
 
     TALLY_BOOK_NOT_EXIST(180001, "记账本数据不存在", null),
 

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

@@ -7,9 +7,10 @@ package com.cool.store.enums;
  * @注释:
  */
 public enum JoinModeEnum {
-    FRANCHISE_DEPARTMENT(1,"社会加盟模式/加盟部加盟店"),
-    FRANCHISE_COMPANIES(2,"强加盟模式/加盟公司加盟店"),
-    OWN_STORE(3,"加盟公司自有店");
+    FRANCHISE_DEPARTMENT(1,"加盟部加盟店"),
+    FRANCHISE_COMPANIES(2,"加盟公司加盟店"),
+    OWN_STORE(3,"加盟公司自有店"),
+    STRONG_FRANCHISE(4,"强加盟");
     private int code;
     private String desc;
     private JoinModeEnum(int code, String desc) {

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

@@ -49,7 +49,7 @@ public enum UserRoleEnum {
     FINANCE(1735895867344L,"财务"),
     CHUAN_XIAO_MEI_MANAGER(1731635078802L,"串小妹大区执行总经理"),
     REGIONAL_MANAGER(420000000L,"大区经理"),
-
+    LOGISTICS(430000000L,"物流")
     ;
 
     private Long code;

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

@@ -0,0 +1,23 @@
+package com.cool.store.utils;
+
+/**
+ * @Author: WangShuo
+ * @Date: 2025/04/08/09:52
+ * @Version 1.0
+ * @注释:
+ */
+public enum HomeTemplateTypeEnum {
+    MINI_OPEN_SOURCE_HOME(1,"Mini开源首页");
+    private Integer code;
+    private String desc;
+    HomeTemplateTypeEnum(Integer code, String desc) {
+        this.code = code;
+        this.desc = desc;
+    }
+    public Integer getCode() {
+        return code;
+    }
+    public String getDesc() {
+        return desc;
+    }
+}