suzhuhong/zxjp-web
1
0
Fork 0
Code Issues Pull Requests Actions Packages Projects Releases Wiki Activity

Merge #66 into master from cc_20260305_opPlan_remove

Browse Source 
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: 王非凡 <accounts_67eba0c5fee9c49c80c8e2b4@mail.teambition.com>
Merged-by: 正新 <accounts_6964c7bcd2a2c377c5bbd01b@mail.teambition.com>

CR-link: https://codeup.aliyun.com/692ea314dec569489f6f167c/hangzhou/java/custom_zxjp/change/66
This commit is contained in:
王非凡
2026-03-18 09:05:58 +00:00
committed by 正新
parent 6e2861b3f0
commit 76d0c0bf32
2 changed files with 17 additions and 9 deletions
Download Patch File Download Diff File Expand all files Collapse all files

4
coolstore-partner-dao/src/main/java/com/cool/store/dao/ShopStageInfoDAO.java
View File

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

22
coolstore-partner-service/src/main/java/com/cool/store/service/impl/ShopServiceImpl.java
View File

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