From 76d0c0bf32a112c619b1560b58b77732e4e64493 Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?=E7=8E=8B=E9=9D=9E=E5=87=A1?= Date: Wed, 18 Mar 2026 09:05:58 +0000 Subject: [PATCH] Merge #66 into master from cc_20260305_opPlan_remove MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit fix:加盟合同签约完成后门店编码修改时推送新管家 * cc_20260305_opPlan_remove: (3 commits squashed) - fix:开业运营方案阶段不初始化 - fix:加盟合同签约完成后门店编码修改时推送新管家 - Merge branch 'master' into cc_20260305_opPlan_remove # Conflicts: # coolstore-partner-dao/src/main/java/com/cool/store/dao/ShopStageInfoDAO.java Signed-off-by: 王非凡 Merged-by: 正新 CR-link: https://codeup.aliyun.com/692ea314dec569489f6f167c/hangzhou/java/custom_zxjp/change/66 --- .../com/cool/store/dao/ShopStageInfoDAO.java | 4 ++++ .../store/service/impl/ShopServiceImpl.java | 22 +++++++++++-------- 2 files changed, 17 insertions(+), 9 deletions(-) diff --git a/coolstore-partner-dao/src/main/java/com/cool/store/dao/ShopStageInfoDAO.java b/coolstore-partner-dao/src/main/java/com/cool/store/dao/ShopStageInfoDAO.java index 0784eaa05..7f69c1172 100644 --- a/coolstore-partner-dao/src/main/java/com/cool/store/dao/ShopStageInfoDAO.java +++ b/coolstore-partner-dao/src/main/java/com/cool/store/dao/ShopStageInfoDAO.java @@ -59,6 +59,10 @@ public class ShopStageInfoDAO { // 三明治跳过营帐通开通 continue; } + // 开业运营方案删除 + if (shopSubStageEnum.equals(ShopSubStageEnum.SHOP_STAGE_14)) { + continue; + } ShopStageInfoDO shopStageInfo = new ShopStageInfoDO(); shopStageInfo.setLineId(lineInfoDO.getId()); shopStageInfo.setShopId(shopId); diff --git a/coolstore-partner-service/src/main/java/com/cool/store/service/impl/ShopServiceImpl.java b/coolstore-partner-service/src/main/java/com/cool/store/service/impl/ShopServiceImpl.java index 58cdde940..aac20a9d5 100644 --- a/coolstore-partner-service/src/main/java/com/cool/store/service/impl/ShopServiceImpl.java +++ b/coolstore-partner-service/src/main/java/com/cool/store/service/impl/ShopServiceImpl.java @@ -475,15 +475,19 @@ public class ShopServiceImpl implements ShopService { shopInfo.setManagerRegionId(request.getManagerRegionId()); shopInfo.setInvestRegionId(request.getInvestRegionId()); Integer f = shopInfoDAO.updateShopInfo(shopInfo); -// if (StringUtils.isNotBlank(request.getShopCode()) && StringUtils.compare(request.getShopCode().trim(), oldShopCode) != 0) { -// try { -// log.info("门店编码发生修改，推送新管家"); -// ZxjpApiRequest data = shopAccountService.getData(request.getShopId(), DownSystemTypeEnum.XGJ); -// pushService.pushDataToXGJ(data); -// } catch (Exception e) { -// log.error("推送新管家失败", e); -// } -// } + if (StringUtils.isNotBlank(request.getShopCode()) && StringUtils.compare(request.getShopCode().trim(), oldShopCode) != 0) { + // 完成合同签约后推送新管家 + ShopStageInfoDO contractStage = shopStageInfoDAO.getShopSubStageInfo(request.getShopId(), SHOP_STAGE_8); + if (contractStage.getShopSubStageStatus().equals(ShopSubStageStatusEnum.SHOP_SUB_STAGE_STATUS_84.getShopSubStageStatus())) { + try { + log.info("门店编码发生修改，推送新管家"); + ZxjpApiRequest data = shopAccountService.getData(request.getShopId(), DownSystemTypeEnum.XGJ); + pushService.pushDataToXGJ(data); + } catch (Exception e) { + log.error("推送新管家失败", e); + } + } + } return f; }