Merge branch 'cc_20250909_new' into cc_20250903_big_screen

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

@@ -308,6 +308,10 @@ public enum ErrorCodeEnum {
     CONFIG_NOT_EXIST(1610006,"配置不存在或被禁用，请确认！",null),
     MESSAGE_NOT_EXIST(1610007,"消息模板不存在或已被删除",null),
     MESSAGE_NOT_HANDLED(1610008,"当前消息无需处理，请确认消息处理类型！",null),
+
+
+    NOT_FLAGSHIP_STORE(16100005,"非直营店，无法跳过缴费阶段！",null),
+    NOT_FLAGSHIP_STORE_NOT_EXIST(16100006,"当前阶段加盟类型不能变更！",null),
     ;
 
 

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

@@ -52,6 +52,17 @@ public enum FranchiseBrandEnum {
         }
         return null;
     }
+    public static String getDescByCode(Integer code) {
+        if (code==null){
+            return null;
+        }
+        for (FranchiseBrandEnum e : FranchiseBrandEnum.values()) {
+            if (code == e.getCode()) {
+                return e.getDesc();
+            }
+        }
+        return null;
+    }
 
     public static FranchiseBrandEnum getEnumByCode(Integer code) {
         if (code == null){

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

@@ -12,7 +12,8 @@ public enum JoinModeEnum {
     OWN_STORE(3,"加盟公司自有店"),
     STRONG_FRANCHISE(4,"强加盟"),
     DIRECT_SALES_TO_JOINING(5,"老店转加盟"),
-    AFFILIATES(6,"联营店")
+    AFFILIATES(6,"联营店"),
+    FLAGSHIP_STORE(7,"直营店"),
     ;
     private int code;
     private String desc;

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

@@ -16,7 +16,8 @@ public enum RocketMqTagEnum {
     DEPT_EVENT("dept_event","部门事件"),
     STORE_DING_QUEUE("store_ding_queue", "微应用钉钉消息发送"),
     ZXJP_CREATE_STORE("zxjp_create_store", "正新鸡排招商创建门店"),
-    PARTNER_LICENSE_SYNC_QUEUE("partner_license_sync_queue", "招商证照信息同步");
+    PARTNER_LICENSE_SYNC_QUEUE("partner_license_sync_queue", "招商证照信息同步"),
+    BUSINESS_SYNC("business_sync", "工商食安信息同步"),
     ;
 
 

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

@@ -11,17 +11,19 @@ import java.util.Objects;
 public enum PaymentMethodEnum {
 
     //1.月付 2.季付 3.半年付 4.年付
-    PAYMENT_METHOD_1(1, "月付"),
-    PAYMENT_METHOD_2(2, "季付"),
-    PAYMENT_METHOD_3(3, "半年付"),
-    PAYMENT_METHOD_4(4, "年付"),
+    PAYMENT_METHOD_1(1, "月付",1),
+    PAYMENT_METHOD_2(2, "季付",3),
+    PAYMENT_METHOD_3(3, "半年付",6),
+    PAYMENT_METHOD_4(4, "年付",12),
     ;
 
     private Integer code;
 
     private String desc;
 
-    PaymentMethodEnum(Integer code, String desc) {
+    private Integer totalMonth;
+
+    PaymentMethodEnum(Integer code, String desc,Integer totalMonth) {
         this.code = code;
         this.desc = desc;
     }
@@ -34,6 +36,9 @@ public enum PaymentMethodEnum {
         return desc;
     }
 
+    public Integer getTotalMonth() {
+        return totalMonth;
+    }
 
     public static PaymentMethodEnum getByCode(Integer code) {
         if(Objects.isNull(code)){