Merge branch 'refs/heads/master' into cc_20251112_wallet

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

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

@@ -0,0 +1,37 @@
+package com.cool.store.enums.Decoration;
+
+/**
+ * @Author suzhuhong
+ * @Date 2025/11/3 9:40
+ * @Version 1.0
+ */
+public enum DecorationDescStatus {
+
+    TO_BE_ASSIGNED(0, "待分配"),
+    ASSIGNED(1, "已分配"),
+    ;
+
+
+
+
+    private Integer code;
+
+    private String descStatus;
+
+    DecorationDescStatus(Integer code, String descStatus) {
+        this.code = code;
+        this.descStatus = descStatus;
+    }
+
+    public Integer getCode() {
+        return code;
+    }
+
+    public String getDescStatus() {
+        return descStatus;
+    }
+
+
+
+
+}

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

@@ -0,0 +1,32 @@
+package com.cool.store.enums.Decoration;
+
+/**
+ * @Author suzhuhong
+ * @Date 2025/10/30 14:35
+ * @Version 1.0
+ */
+public enum DecorationUseSystemEnum {
+
+    CRM(1,"CRM"),
+    HQT(2,"红圈通");
+
+
+    private Integer code;
+
+    private String userSystemName;
+
+
+    DecorationUseSystemEnum(Integer code, String userSystemName) {
+        this.code = code;
+        this.userSystemName = userSystemName;
+    }
+
+    public Integer getCode() {
+        return code;
+    }
+
+    public String getUserSystemName() {
+        return userSystemName;
+    }
+
+}

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

@@ -316,6 +316,8 @@ public enum ErrorCodeEnum {
     NOT_FLAGSHIP_STORE_NOT_EXIST(1610011,"当前阶段加盟类型不能变更！",null),
     JOIN_MODE_NOT_ALLOW_OPERATE(1610012,"加盟部人员只能新建加盟店或联营店，请确认！",null),
     STORE_NOT_FIND(1610013,"门店不存在",null),
+    //装修
+    TEAM_USED(1612001,"该装修团队有门店使用，无法删除，请确认！",null),
 
     WALLET_OPEN_ACCOUNT_FAIL(1620001,"钱包开通失败",null),
     WALLET_WITH_DRAWER_FAIL(1620002,"提现失败",null),

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

@@ -33,7 +33,8 @@ public enum RocketMqGroupEnum {
     FEI_SHU_EVENT_LISTENER("fei_shu_event_listener", new ArrayList<>(Arrays.asList(RocketMqTagEnum.USER_EVENT, RocketMqTagEnum.AUTH_SCOPE_CHANGE, RocketMqTagEnum.DEPT_EVENT))),
 
 
-    STORE_USER_UPDATE("store_user_update",  new ArrayList<>(Arrays.asList(RocketMqTagEnum.STORE_USER_UPDATE)))
+    STORE_USER_UPDATE("store_user_update",  new ArrayList<>(Arrays.asList(RocketMqTagEnum.STORE_USER_UPDATE))),
+    SHOP_DECORATION_ASSIGN("shop_decoration_assign",  new ArrayList<>(Arrays.asList(RocketMqTagEnum.DELAY_SHOP_DECORATION_ASSIGN)))
 
     ;
 

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

@@ -18,7 +18,8 @@ public enum RocketMqTagEnum {
     ZXJP_CREATE_STORE("zxjp_create_store", "正新鸡排招商创建门店"),
     PARTNER_LICENSE_SYNC_QUEUE("partner_license_sync_queue", "招商证照信息同步"),
     BUSINESS_SYNC("business_sync", "工商食安信息同步"),
-    STORE_USER_UPDATE("store_user_update", "门店信息人员变更同步菜品");
+    STORE_USER_UPDATE("store_user_update", "门店信息人员变更同步菜品"),
+    DELAY_SHOP_DECORATION_ASSIGN("shop_decoration_assign","门店装修分配");
     ;
 
 

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

@@ -7,11 +7,11 @@ package com.cool.store.enums;
  */
 public enum SMSMsgEnum {
 
-    PAY_FRANCHISE_FEES("缴纳加盟费/保证金", "", "SMS_474655067"),
-    SIGN_CONTRACT("合同签署", "", "SMS_474450102"),
-    DESIGN_STAGE("设计阶段", "", "SMS_474490087"),
-    CONSTRUCTION_STAGE("施工阶段", "", "SMS_474525082"),
-    PLATFORM_BUILD_STORE("平台建店", "", "SMS_474645064"),
+    PAY_FRANCHISE_FEES("缴纳加盟费/保证金", "", "SMS_498895215"),
+    SIGN_CONTRACT("合同签署", "", "SMS_498840165"),
+    DESIGN_STAGE("设计阶段", "", "SMS_498750214"),
+    CONSTRUCTION_STAGE("施工阶段", "", "SMS_498870170"),
+    PLATFORM_BUILD_STORE("平台建店", "", "SMS_498730163"),
     ;
 
     private String title;

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

@@ -70,7 +70,7 @@ public enum UserRoleEnum {
     JING_DONG_OPERATIONS_CUSTOMER(500000000L,"京东运营大区客服"),
     JING_DONG_HEADQUARTERS_BUILD_CUSTOMER(510000000L,"京东总部建店客服"),
     FRANCHISEES(530000000L,"加盟商"),
-    SERVICE_PACKAGE_DEDICATED(1725431698852L,"服务包专用"),
+    SERVICE_PACKAGE_DEDICATED(1762761165005L,"服务包专用"),
     ;
 
     private Long code;