From 526482aab8becf53639f2d447973620aaa331ea2 Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?=E7=8E=8B=E9=9D=9E=E5=87=A1?= Date: Wed, 27 May 2026 01:44:13 +0000 Subject: [PATCH] Merge #150 into master from cc_20260408_close_up_v2 MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit fix:歇业审批添加5s防抖 * cc_20260408_close_up_v2: (38 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 - fix:平台关闭开启处理自动发起三方调用 - Merge branch 'master' into cc_20260408_close_up_v2 # Conflicts: # coolstore-partner-service/src/main/java/com/cool/store/service/closeup/impl/CloseUpServiceImpl.java # coolstore-partner-web/src/main/java/com/cool/store/job/XxlJobHandler.java - fix:平台关闭开启时调用三方平台接口 - fix:修复自动关闭三方平台状态更新失败的问题 - Merge branch 'refs/heads/master' into cc_20260408_close_up_v2 - fix:修复三方门店歇业失败时POS待办不更新的问题 - fix:歇业审批添加5s防抖 Signed-off-by: 王非凡 Merged-by: 正新 CR-link: https://codeup.aliyun.com/692ea314dec569489f6f167c/hangzhou/java/custom_zxjp/change/150 --- .../java/com/cool/store/controller/webb/CloseUpController.java | 3 +++ 1 file changed, 3 insertions(+) diff --git a/coolstore-partner-web/src/main/java/com/cool/store/controller/webb/CloseUpController.java b/coolstore-partner-web/src/main/java/com/cool/store/controller/webb/CloseUpController.java index e7913aea0..c9539e22a 100644 --- a/coolstore-partner-web/src/main/java/com/cool/store/controller/webb/CloseUpController.java +++ b/coolstore-partner-web/src/main/java/com/cool/store/controller/webb/CloseUpController.java @@ -1,5 +1,6 @@ package com.cool.store.controller.webb; +import com.cool.store.annotation.Debounce; import com.cool.store.request.closeup.CloseUpAuditRequest; import com.cool.store.request.closeup.CloseUpPlatformHandleRequest; import com.cool.store.request.closeup.CloseUpQueryRequest; @@ -56,12 +57,14 @@ public class CloseUpController { @ApiOperation("审批通过") @PostMapping("/auditPass") + @Debounce(timeMs = 5000) public ResponseResult auditPass(@RequestBody @Validated CloseUpAuditRequest request) { return ResponseResult.success(closeUpService.auditPass(request)); } @ApiOperation("审批拒绝") @PostMapping("/auditRejected") + @Debounce(timeMs = 5000) public ResponseResult auditRefuse(@RequestBody @Validated CloseUpAuditRequest request) { return ResponseResult.success(closeUpService.auditRejected(request)); }