diff --git a/coolstore-partner-service/src/main/java/com/cool/store/service/impl/HqtAPIServiceImpl.java b/coolstore-partner-service/src/main/java/com/cool/store/service/impl/HqtAPIServiceImpl.java index 9983f8452..51091e351 100644 --- a/coolstore-partner-service/src/main/java/com/cool/store/service/impl/HqtAPIServiceImpl.java +++ b/coolstore-partner-service/src/main/java/com/cool/store/service/impl/HqtAPIServiceImpl.java @@ -66,7 +66,7 @@ public class HqtAPIServiceImpl implements HqtAPIService { log.info("开始推送门店信息request:{}",JSONObject.toJSONString(request)); ShopInfoDO shopInfo = shopInfoDAO.getShopInfo(request.getShopId()); //,加盟公司自有店->加盟公司建店 不推送数据 再crm中完成 - if ( shopInfo.getJoinMode().equals(JoinModeEnum.FRANCHISE_COMPANIES.getCode())){ + if ( shopInfo.getJoinMode().equals(JoinModeEnum.OWN_STORE.getCode())){ log.info("加盟公司自有店->加盟公司建店 不推送数据 再crm中完成"); return; } diff --git a/coolstore-partner-service/src/main/java/com/cool/store/service/impl/PreparationServiceImpl.java b/coolstore-partner-service/src/main/java/com/cool/store/service/impl/PreparationServiceImpl.java index 09a5aa02f..b1c786bae 100644 --- a/coolstore-partner-service/src/main/java/com/cool/store/service/impl/PreparationServiceImpl.java +++ b/coolstore-partner-service/src/main/java/com/cool/store/service/impl/PreparationServiceImpl.java @@ -204,7 +204,6 @@ public class PreparationServiceImpl implements PreparationService { list.add(ShopSubStageStatusEnum.SHOP_SUB_STAGE_STATUS_30); list.add(ShopSubStageStatusEnum.SHOP_SUB_STAGE_STATUS_40); list.add(ShopSubStageStatusEnum.SHOP_SUB_STAGE_STATUS_85_1); - list.add(ShopSubStageStatusEnum.SHOP_SUB_STAGE_STATUS_861); list.add(ShopSubStageStatusEnum.SHOP_SUB_STAGE_STATUS_140); list.add(ShopSubStageStatusEnum.SHOP_SUB_STAGE_STATUS_150); shopStageInfoDAO.batchUpdateShopStageStatus(shopId, list); diff --git a/coolstore-partner-service/src/main/java/com/cool/store/service/impl/SignFranchiseServiceImpl.java b/coolstore-partner-service/src/main/java/com/cool/store/service/impl/SignFranchiseServiceImpl.java index a5352f493..fc8a7e5ba 100644 --- a/coolstore-partner-service/src/main/java/com/cool/store/service/impl/SignFranchiseServiceImpl.java +++ b/coolstore-partner-service/src/main/java/com/cool/store/service/impl/SignFranchiseServiceImpl.java @@ -391,6 +391,7 @@ public class SignFranchiseServiceImpl implements SignFranchiseService, AuditResu if ( !shopInfoDO.getJoinMode().equals(JoinModeEnum.FRANCHISE_COMPANIES.getCode())){ hqtAPIService.pushHqtBuild(getHqtBuildRequest(request.getShopId())); } + shopStageInfoDAO.updateShopStageInfo(shopId, ShopSubStageStatusEnum.SHOP_SUB_STAGE_STATUS_861); } shopAuditInfoDO.setResultType(Constants.ZERO_INTEGER); shopAuditInfoDO.setPassReason(request.getCause()); diff --git a/coolstore-partner-web/src/main/java/com/cool/store/controller/webb/PCTestController.java b/coolstore-partner-web/src/main/java/com/cool/store/controller/webb/PCTestController.java index cebf0ec0f..64c87bda8 100644 --- a/coolstore-partner-web/src/main/java/com/cool/store/controller/webb/PCTestController.java +++ b/coolstore-partner-web/src/main/java/com/cool/store/controller/webb/PCTestController.java @@ -538,6 +538,7 @@ public class PCTestController { EnterpriseUserDO userInfoById = enterpriseUserDAO.getUserInfoById(shopInfo.getInvestmentManager()); BigRegionDO bigRegionDO = bigRegionDAO.getByRegionId(shopInfo.getRegionId()); HqtBuildRequest request = new HqtBuildRequest(); + request.setShopId(shopId); request.setShopCode(shopInfo.getShopCode()); request.setShopName(shopInfo.getShopName()); request.setShopDecorationAttributes(shopInfo.getShopDecorationAttributes());