Merge branch 'master' into cc_20250513_franchise_report

coolstore-partner-common/src/main/java/com/cool/store/constants/RedisConstant.java

@@ -277,4 +277,6 @@ public class RedisConstant {
      * 招商经理轮询key
      */
     public static final String YUN_XUE_TANG_ACCESS_TOKEN = "yun_xue_tang_access_token_";
+
+    public static final String SUBMIT_BUILD_KEY = "submit_build_key_";
 }

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,"强加盟"),
+    DIRECT_SALES_TO_JOINING(5,"直营转加盟")
     ;
     private int code;
     private String desc;

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

@@ -106,5 +106,8 @@ public class RedisConstantUtil {
     public String getInvestmentManagerKey(Long wantShopAreaId, Long roleId) {
         return active + "_" + RedisConstant.INVESTMENT_MANAGER_CACHE + eid + ":" + wantShopAreaId + ":" + roleId ;
     }
+    public String submitBuildKey(Long shopId){
+        return active + "_" + RedisConstant.SUBMIT_BUILD_KEY + eid + ":" + shopId ;
+    }
 
 }