Merge branch 'cc_20251021_join' into 'master'

Cc 20251021 join

See merge request hangzhou/java/custom_zxjp!176

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

@@ -312,6 +312,7 @@ public enum ErrorCodeEnum {
 
     NOT_FLAGSHIP_STORE(16100005,"非直营店，无法跳过缴费阶段！",null),
     NOT_FLAGSHIP_STORE_NOT_EXIST(16100006,"当前阶段加盟类型不能变更！",null),
+    JOIN_MODE_NOT_ALLOW_OPERATE(16100007,"加盟部人员只能新建加盟店或联营店，请确认！",null),
     ;
 
 

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

@@ -38,4 +38,10 @@ public enum JoinModeEnum {
         }
         return null;
     }
+    /**
+     * 是否是加盟部加盟店或者联营店 如果不是 返回false
+     */
+    public static boolean isFranchise(Integer code) {
+        return code == FRANCHISE_DEPARTMENT.code || code == AFFILIATES.code;
+    }
 }