Merge #148 into master from cc_20260522_close_up_fix

fix:自动恢复营业门店状态判断修复

* cc_20260522_close_up_fix: (1 commits squashed)

  - 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/148
This commit is contained in:
王非凡
2026-05-22 09:44:13 +00:00
committed by 正新
parent e305fa8d95
commit 555f4cd089

View File

@@ -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());
}