From 555f4cd089f25cc996418845bca74eab955bc018 Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?=E7=8E=8B=E9=9D=9E=E5=87=A1?= Date: Fri, 22 May 2026 09:44:13 +0000 Subject: [PATCH] Merge #148 into master from cc_20260522_close_up_fix MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit fix:自动恢复营业门店状态判断修复 * cc_20260522_close_up_fix: (1 commits squashed) - fix:自动恢复营业门店状态判断修复 Signed-off-by: 王非凡 Merged-by: 正新 CR-link: https://codeup.aliyun.com/692ea314dec569489f6f167c/hangzhou/java/custom_zxjp/change/148 --- .../store/service/closeup/impl/CloseUpServiceImpl.java | 10 ++++++++-- 1 file changed, 8 insertions(+), 2 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 ff60c0304..335b51491 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 @@ -612,8 +612,8 @@ public class CloseUpServiceImpl implements CloseUpService { log.info("门店不存在"); return; } - if (!StoreStatusEnum.CLOSE_UP.getValue().equals(storeDO.getStoreStatus())) { - log.info("门店不是歇业状态"); + if (!StoreStatusEnum.OPEN.getValue().equals(storeDO.getStoreStatus())) { + log.info("门店不是open状态, storeNum:{}", storeDO.getStoreNum()); return; } CloseUpApplyFormDO update = CloseUpApplyFormDO.builder() @@ -623,6 +623,12 @@ public class CloseUpServiceImpl implements CloseUpService { applyFormDAO.updateByPrimaryKeySelective(update); // 校验歇业单是否已经恢复过营业 storeDao.closeUpToOpen(formDO.getStoreId()); + try { + StoreMasterIssueDTO storeMasterIssueDTO = new StoreMasterIssueDTO(enterpriseId, Collections.singletonList(formDO.getStoreId())); + simpleMessageService.send(JSONObject.toJSONString(storeMasterIssueDTO), RocketMqTagEnum.STORE_MASTER_ISSUE); + } catch (Exception e) { + log.error("mq通知主应用下发门店主数据失败"); + } log.info("歇业申请后门店自动恢复营业, storeId:{}", formDO.getStoreId()); }