Merge #126 into master from cc_20260408_close_up

歇业管理逻辑修改 * cc_20260408_close_up: (31 commits squashed) - fix:歇业管理（部分） - fix:歇业管理（部分） - fix:审批逻辑修改；拒绝审批实现 - fix:恢复开业申请及审批 - fix:主流程补充 - fix:主流程补充 - fix:字段补充及逻辑修改 - fix:字段补充 - fix - fix:平台处理新增字段 - fix - Merge remote-tracking branch 'origin/cc_20260408_close_up' into cc_20260408_close_up - fix:歇业营业发送短信 - fix:排序 - fix:详情接口新增加盟商手机号字段；申请单日期和已有申请单存在交集时申请失败 - fix:申请单详情接口新增品牌字段 - fix:新增列表筛选条件；审批单状态校验 - Merge branch 'master' into cc_20260408_close_up # Conflicts: #	coolstore-partner-common/src/main/java/com/cool/store/enums/ErrorCodeEnum.java - fix:歇业对接三方平台 - fix:歇业对接三方平台 - fix:日志 - fix:歇业后自动恢复营业;抖音自动歇业三方对接 - fix:歇业后自动恢复营业;抖音自动歇业三方对接 - fix:火码平台账号处理状态初始化为已处理 - Merge remote-tracking branch 'origin/cc_20260408_close_up' into cc_20260408_close_up - fix:歇业管理逻辑修改 - Merge branch 'cc_20260511_close_up_modify' into cc_20260408_close_up # Conflicts: #	coolstore-partner-common/src/main/java/com/cool/store/enums/ErrorCodeEnum.java #	coolstore-partner-common/src/main/java/com/cool/store/enums/RocketMqGroupEnum.java #	coolstore-partner-common/src/main/java/com/cool/store/enums/RocketMqTagEnum.java #	coolstore-partner-common/src/main/java/com/cool/store/enums/closeup/CloseUpPlatformEnum.java #	coolstore-partner-dao/src/main/java/com/cool/store/dao/closeup/CloseUpPlatformDAO.java #	coolstore-partner-dao/src/main/java/com/cool/store/mapper/StoreMapper.java #	coolstore-partner-dao/src/main/java/com/cool/store/mapper/closeup/CloseUpPlatformMapper.java #	coolstore-partner-dao/src/main/resources/mapper/StoreMapper.xml #	coolstore-partner-dao/src/main/resources/mapper/closeup/CloseUpApplyFormMapper.xml #	coolstore-partner-dao/src/main/resources/mapper/closeup/CloseUpPlatformMapper.xml #	coolstore-partner-model/src/main/java/com/cool/store/entity/closeup/CloseUpApplyFormDO.java #	coolstore-partner-model/src/main/java/com/cool/store/entity/closeup/CloseUpPlatformDO.java #	coolstore-partner-service/src/main/java/com/cool/store/mq/consumer/ConsumerClient.java #	coolstore-partner-service/src/main/java/com/cool/store/service/closeup/CloseUpService.java #	coolstore-partner-service/src/main/java/com/cool/store/service/closeup/impl/CloseUpServiceImpl.java #	coolstore-partner-web/src/main/java/com/cool/store/controller/webb/PCTestController.java #	coolstore-partner-web/src/main/java/com/cool/store/job/XxlJobHandler.java #	coolstore-partner-web/src/main/resources/application-ab.properties #	coolstore-partner-web/src/main/resources/application-local.properties #	coolstore-partner-web/src/main/resources/application-online.properties #	coolstore-partner-web/src/main/resources/application-test.properties - fix:合并冲突 - Merge branch 'master' into cc_20260408_close_up - fix:火码歇业时机修改 - fix Signed-off-by: 王非凡 <accounts_67eba0c5fee9c49c80c8e2b4@mail.teambition.com> Merged-by: 正新 <accounts_6964c7bcd2a2c377c5bbd01b@mail.teambition.com> CR-link: https://codeup.aliyun.com/692ea314dec569489f6f167c/hangzhou/java/custom_zxjp/change/126
2026-05-12 08:13:30 +00:00
parent 27af1561ac
commit 56b85c3322
26 changed files with 729 additions and 58 deletions
--- a/coolstore-partner-common/src/main/java/com/cool/store/enums/ErrorCodeEnum.java
+++ b/coolstore-partner-common/src/main/java/com/cool/store/enums/ErrorCodeEnum.java
@@ -423,7 +423,7 @@ public enum ErrorCodeEnum {
    CLOSE_STORE_REFUND_MK_USER_NOT_EXIST(1710016, "当前用户不存在每刻权限", null),
    CLOSE_STORE_REFUND_EXIST_EFFECTIVE_RECORD(1710017, "存在生效中的退款申请！", null),
    CLOSE_STORE_REFUND_TYPE_ERROR(1710018, "退款类型错误", null),
-    CLOSE_STORE_ONLY_SUPPORT_OPEN(1710019, "仅支持在营或暂停营业的门店发起闭店申请", null),
+    CLOSE_STORE_ONLY_SUPPORT_OPEN(1710019, "仅支持在营门店发起闭店申请", null),
    CLOSE_STORE_ONLY_APPROVAL_ENABLE_SUSPEND(1710020, "仅审批中申请允许中止", null),

    /**
--- a/coolstore-partner-common/src/main/java/com/cool/store/enums/RocketMqGroupEnum.java
+++ b/coolstore-partner-common/src/main/java/com/cool/store/enums/RocketMqGroupEnum.java
@@ -40,6 +40,7 @@ public enum RocketMqGroupEnum {
    VISIT_RECORD_INVALID("visit_record_invalid", new ArrayList<>(Arrays.asList(RocketMqTagEnum.VISIT_RECORD_INVALID))),
    TP_PENALTY_APPEAL_OVERDUE("tp_penalty_appeal_overdue", new ArrayList<>(Arrays.asList(RocketMqTagEnum.TP_PENALTY_APPEAL_OVERDUE))),
    CLOSE_UP_APPLY_STORE_UPDATE("close_up_apply_store_update", new ArrayList<>(Arrays.asList(RocketMqTagEnum.CLOSE_UP_APPLY_STORE_UPDATE))),
+    CLOSE_UP_PLAN_OPEN_STORE("close_up_plan_open_store", new ArrayList<>(Arrays.asList(RocketMqTagEnum.CLOSE_UP_PLAN_OPEN_STORE))),
    ;

    private final String group;
--- a/coolstore-partner-common/src/main/java/com/cool/store/enums/RocketMqTagEnum.java
+++ b/coolstore-partner-common/src/main/java/com/cool/store/enums/RocketMqTagEnum.java
@@ -24,6 +24,7 @@ public enum RocketMqTagEnum {
    VISIT_RECORD_INVALID("visit_record_invalid", "拜访记录失效"),
    TP_PENALTY_APPEAL_OVERDUE("tp_penalty_appeal_overdue", "十二分惩处单复议逾期"),
    CLOSE_UP_APPLY_STORE_UPDATE("close_up_apply_store_update", "歇业申请修改门店状态"),
+    CLOSE_UP_PLAN_OPEN_STORE("close_up_plan_open_store", "歇业申请计划开店"),
    ;


--- a/coolstore-partner-common/src/main/java/com/cool/store/enums/closeup/CloseUpPlatformEnum.java
+++ b/coolstore-partner-common/src/main/java/com/cool/store/enums/closeup/CloseUpPlatformEnum.java
@@ -14,14 +14,14 @@ import lombok.Getter;
@Getter
@AllArgsConstructor
 public enum CloseUpPlatformEnum {
-    DOUYINTG("douyintg", "抖音", 0, "https://ossfilezx.coolstore.cn/icon/closeup/douyin.png"),
-    ELEMEWM("elemewm", "饿了么", 0, "https://ossfilezx.coolstore.cn/icon/closeup/ele.png"),
-    HUOMA("huoma", "火码POS", 0, "https://ossfilezx.coolstore.cn/icon/closeup/huoma.png"),
-    JINGDONGWM("jingdongwm", "京东外卖", 0, "https://ossfilezx.coolstore.cn/icon/closeup/jingdong.png"),
-    KUAISHOUTG("kuaishoutg", "快手团购", 0, "https://ossfilezx.coolstore.cn/icon/closeup/kuaishou.png"),
-    MEITUANTG("meituantg", "美团团购", 0, "https://ossfilezx.coolstore.cn/icon/closeup/meituan.png"),
-    MEITUANWM("meituanwm", "美团外卖", 0, "https://ossfilezx.coolstore.cn/icon/closeup/meituanwx.png"),
-    ZHIFUBAO("zhifubao", "支付宝团购", 0, "https://ossfilezx.coolstore.cn/icon/closeup/zhifubao.png"),
+    DOUYINTG("douyintg", "抖音", 1, 8, "https://ossfilezx.coolstore.cn/icon/closeup/douyin.png"),
+    ELEMEWM("elemewm", "饿了么", 1, 2, "https://ossfilezx.coolstore.cn/icon/closeup/ele.png"),
+    HUOMA("huoma", "火码POS", 1, null, "https://ossfilezx.coolstore.cn/icon/closeup/huoma.png"),
+    JINGDONGWM("jingdongwm", "京东外卖", 1, 4, "https://ossfilezx.coolstore.cn/icon/closeup/jingdong.png"),
+    KUAISHOUTG("kuaishoutg", "快手团购", 0, null, "https://ossfilezx.coolstore.cn/icon/closeup/kuaishou.png"),
+    MEITUANTG("meituantg", "美团团购", 1, 1, "https://ossfilezx.coolstore.cn/icon/closeup/meituan.png"),
+    MEITUANWM("meituanwm", "美团外卖", 1, 1, "https://ossfilezx.coolstore.cn/icon/closeup/meituanwx.png"),
+    ZHIFUBAO("zhifubao", "支付宝团购", 0, null, "https://ossfilezx.coolstore.cn/icon/closeup/zhifubao.png"),
    ;

    /**
@@ -36,8 +36,21 @@ public enum CloseUpPlatformEnum {
     * 关闭类型
     */
    private final Integer type;
+    /**
+     * 平台关闭code
+     */
+    private final Integer platformCode;
    /**
     * 图标地址
     */
    private final String icon;
+
+    public static Integer getPlatformCodeByCode(String code) {
+        for (CloseUpPlatformEnum value : CloseUpPlatformEnum.values()) {
+            if (value.code.equals(code)) {
+                return value.getPlatformCode();
+            }
+        }
+        return null;
+    }
 }