From 1881101f2a738d14b34bc5419bbc7907f5965dbf Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?=E7=8E=8B=E9=9D=9E=E5=87=A1?= Date: Wed, 13 May 2026 09:14:52 +0000 Subject: [PATCH] Merge #137 into master from cc_20260408_close_up MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit fix:歇业时火码自动关闭时机修改 * cc_20260408_close_up: (33 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 # Conflicts: # coolstore-partner-service/src/main/java/com/cool/store/service/closeup/impl/CloseUpServiceImpl.java Signed-off-by: 王非凡 Merged-by: 正新 CR-link: https://codeup.aliyun.com/692ea314dec569489f6f167c/hangzhou/java/custom_zxjp/change/137 --- .../store/service/closeup/impl/CloseUpServiceImpl.java | 9 +++++---- 1 file changed, 5 insertions(+), 4 deletions(-) diff --git a/coolstore-partner-service/src/main/java/com/cool/store/service/closeup/impl/CloseUpServiceImpl.java b/coolstore-partner-service/src/main/java/com/cool/store/service/closeup/impl/CloseUpServiceImpl.java index 02f4b10ac..ff60c0304 100644 --- a/coolstore-partner-service/src/main/java/com/cool/store/service/closeup/impl/CloseUpServiceImpl.java +++ b/coolstore-partner-service/src/main/java/com/cool/store/service/closeup/impl/CloseUpServiceImpl.java @@ -516,6 +516,9 @@ public class CloseUpServiceImpl implements CloseUpService { Integer ongoingPlatformCode = CloseUpPlatformEnum.getPlatformCodeByCode(v.getCode()); if (Objects.nonNull(ongoingPlatformCode)) { platformCode = platformCode | ongoingPlatformCode; + } else { + CloseUpPlatformDO updatePlatform = CloseUpPlatformDO.builder().id(v.getId()).status(1).build(); + updatePlatformList.add(updatePlatform); } } if (platformCode == 0) { @@ -526,12 +529,10 @@ public class CloseUpServiceImpl implements CloseUpService { if (Objects.nonNull(platformStatusDTO) && CollectionUtils.isNotEmpty(platformStatusDTO.getPlatformResults())) { Map map = CollStreamUtil.toMap(platformStatusDTO.getPlatformResults(), PlatformStatusDTO.PlatformUpdateResult::getPlatformCode, v -> v); for (CloseUpPlatformDO closeUpPlatformDO : unClosePlatformList) { - if (CloseUpPlatformEnum.HUOMA.getCode().equals(closeUpPlatformDO.getCode())) { - CloseUpPlatformDO updatePlatform = CloseUpPlatformDO.builder().id(closeUpPlatformDO.getId()).status(1).build(); - updatePlatformList.add(updatePlatform); + Integer platformCodeByCode = CloseUpPlatformEnum.getPlatformCodeByCode(closeUpPlatformDO.getCode()); + if (Objects.isNull(platformCodeByCode)) { continue; } - Integer platformCodeByCode = CloseUpPlatformEnum.getPlatformCodeByCode(closeUpPlatformDO.getCode()); PlatformStatusDTO.PlatformUpdateResult result = map.get(String.valueOf(platformCodeByCode)); if (Objects.nonNull(result) && Boolean.TRUE.equals(result.getSuccess())) { CloseUpPlatformDO updatePlatform = CloseUpPlatformDO.builder()