diff --git a/coolstore-partner-service/src/main/java/com/cool/store/service/PreparationService.java b/coolstore-partner-service/src/main/java/com/cool/store/service/PreparationService.java index 508c602f9..5cc920f53 100644 --- a/coolstore-partner-service/src/main/java/com/cool/store/service/PreparationService.java +++ b/coolstore-partner-service/src/main/java/com/cool/store/service/PreparationService.java @@ -48,6 +48,12 @@ public interface PreparationService { * @param shopId */ void sysStoreCompleted(Long shopId); + + /** + * 营业执照和建店资料收集阶段完成后推进POS和营帐通开通 + * @param shopId 店铺id + */ + void businessLicenseAndBuildStoreCompleted(Long shopId); /** * 证照办理+建店资料 都完成 初始化平台建店数据 * @param shopId @@ -89,6 +95,7 @@ public interface PreparationService { /** * POS 建店昨天完成 * 选址与建店资料完成(加盟合同完成) + * v20251024 选址与建店资料完成与营业执照完成 * @param shopId * @return */ diff --git a/coolstore-partner-service/src/main/java/com/cool/store/service/impl/ApplyLicenseServiceImpl.java b/coolstore-partner-service/src/main/java/com/cool/store/service/impl/ApplyLicenseServiceImpl.java index 773f13871..885c089d6 100644 --- a/coolstore-partner-service/src/main/java/com/cool/store/service/impl/ApplyLicenseServiceImpl.java +++ b/coolstore-partner-service/src/main/java/com/cool/store/service/impl/ApplyLicenseServiceImpl.java @@ -138,9 +138,11 @@ public class ApplyLicenseServiceImpl implements ApplyLicenseService { ShopStageInfoDO shopSubStageInfo = shopStageInfoDAO.getShopSubStageInfo(request.getShopId(), ShopSubStageEnum.SHOP_STAGE_3); if (Constants.ONE_INTEGER.equals(request.getSubmitStatus()) && shopSubStageInfo.getShopSubStageStatus().equals(ShopSubStageStatusEnum.SHOP_SUB_STAGE_STATUS_30.getShopSubStageStatus())) { shopStageInfoDAO.updateShopStageAndAuditInfo(request.getShopId(), ShopSubStageStatusEnum.SHOP_SUB_STAGE_STATUS_33, null); + preparationService.businessLicenseAndBuildStoreCompleted(request.getShopId()); preparationService.licenseCompleted(request.getShopId()); preparationService.updateShopStatus(request.getShopId()); preparationService.buildStoreAndDecorationComplete(request.getShopId()); + preparationService.selectSiteAndBuildStoreComplete(request.getShopId()); } return Boolean.TRUE; } diff --git a/coolstore-partner-service/src/main/java/com/cool/store/service/impl/OrderSysInfoServiceImpl.java b/coolstore-partner-service/src/main/java/com/cool/store/service/impl/OrderSysInfoServiceImpl.java index c658e1f14..20778e775 100644 --- a/coolstore-partner-service/src/main/java/com/cool/store/service/impl/OrderSysInfoServiceImpl.java +++ b/coolstore-partner-service/src/main/java/com/cool/store/service/impl/OrderSysInfoServiceImpl.java @@ -293,6 +293,7 @@ public class OrderSysInfoServiceImpl implements OrderSysInfoService { //初始化数据 preparationService.licenseCompleted(shopId); preparationService.sysStoreCompleted(shopId); + preparationService.businessLicenseAndBuildStoreCompleted(shopId); preparationService.buildStoreAndDecorationComplete(shopId); preparationService.selectSiteAndBuildStoreComplete(shopId); preparationService.buildStoreComplete(shopId); 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 b1c786bae..91f0e1398 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 @@ -220,9 +220,25 @@ public class PreparationServiceImpl implements PreparationService { equals(shopStageInfoDOMap.get(ShopSubStageEnum.SHOP_STAGE_15.getShopSubStage()).getShopSubStageStatus()); if (flag3) { List list = new ArrayList<>(); - list.add(ShopSubStageStatusEnum.SHOP_SUB_STAGE_STATUS_160); list.add(ShopSubStageStatusEnum.SHOP_SUB_STAGE_STATUS_170); list.add(ShopSubStageStatusEnum.SHOP_SUB_STAGE_STATUS_230); + shopStageInfoDAO.batchUpdateShopStageStatus(shopId, list); + } + } + } + + @Override + public void businessLicenseAndBuildStoreCompleted(Long shopId) { + List shopStageInfo = shopStageInfoDAO.getShopStageInfo(shopId, null); + if (CollectionUtils.isNotEmpty(shopStageInfo)) { + Map shopStageInfoDOMap = shopStageInfo.stream().collect(Collectors.toMap(ShopStageInfoDO::getShopSubStage, data -> data)); + boolean flag1 = ShopSubStageStatusEnum.SHOP_SUB_STAGE_STATUS_156.getShopSubStageStatus(). + equals(shopStageInfoDOMap.get(ShopSubStageEnum.SHOP_STAGE_15.getShopSubStage()).getShopSubStageStatus()); + boolean flag2 = ShopSubStageStatusEnum.SHOP_SUB_STAGE_STATUS_33.getShopSubStageStatus(). + equals(shopStageInfoDOMap.get(ShopSubStageEnum.SHOP_STAGE_3.getShopSubStage()).getShopSubStageStatus()); + if (flag1 && flag2) { + List list = new ArrayList<>(); + list.add(ShopSubStageStatusEnum.SHOP_SUB_STAGE_STATUS_160); list.add(ShopSubStageStatusEnum.SHOP_SUB_STAGE_STATUS_240); shopStageInfoDAO.batchUpdateShopStageStatus(shopId, list); } @@ -345,10 +361,12 @@ public class PreparationServiceImpl implements PreparationService { equals(shopStageInfoDOMap.get(ShopSubStageEnum.SHOP_STAGE_1.getShopSubStage()).getShopSubStageStatus()); Boolean flag3 = ShopSubStageStatusEnum.SHOP_SUB_STAGE_STATUS_156.getShopSubStageStatus(). equals(shopStageInfoDOMap.get(ShopSubStageEnum.SHOP_STAGE_15.getShopSubStage()).getShopSubStageStatus()); + Boolean flag4 = ShopSubStageStatusEnum.SHOP_SUB_STAGE_STATUS_33.getShopSubStageStatus(). + equals(shopStageInfoDOMap.get(ShopSubStageEnum.SHOP_STAGE_3.getShopSubStage()).getShopSubStageStatus()); - log.info("selectSiteAndBuildStoreComplete flag2->{} flag3->{}",flag2,flag3); + log.info("selectSiteAndBuildStoreComplete flag2->{} flag3->{} flag4->{}",flag2,flag3, flag4); //都完成了 状态修改 - if (flag2 && flag3) { + if (flag2 && flag3 && flag4) { shopAccountDAO.updateStatusByShopIdAndSystemName(shopId, Arrays.asList(ShopAccountEnum.HUOMA.getSystemName()), OpenStatusEnum.OPENSTATUSENUM_2.getCode(),null,null); } } diff --git a/coolstore-partner-service/src/main/java/com/cool/store/service/impl/SyncDataServiceImpl.java b/coolstore-partner-service/src/main/java/com/cool/store/service/impl/SyncDataServiceImpl.java index e6c61a1a1..bf79e356f 100644 --- a/coolstore-partner-service/src/main/java/com/cool/store/service/impl/SyncDataServiceImpl.java +++ b/coolstore-partner-service/src/main/java/com/cool/store/service/impl/SyncDataServiceImpl.java @@ -289,43 +289,31 @@ public class SyncDataServiceImpl implements SyncDataService { if (String.valueOf(FranchiseBrandEnum.ZXJP.getCode()).equals(shopInfoDO.getFranchiseBrand())) { //M10001 if (shopCode.matches("M\\d*")) { - return partnershipSignatorySecondIsNull - ? "MX" + shopInfoDO.getShopName() + "(" + signFranchiseDO.getPartnershipSignatoryFirst() + ")" - : "MX" + shopInfoDO.getShopName() + "(" + signFranchiseDO.getPartnershipSignatoryFirst() + "/"+signFranchiseDO.getPartnershipSignatorySecond()+")"; + return "MX" + shopInfoDO.getShopName(); } //FS10001 if (shopCode.matches("FS\\d*")) { - return partnershipSignatorySecondIsNull - ? "FS" + shopInfoDO.getShopName() + "(" + signFranchiseDO.getPartnershipSignatoryFirst() + ")" - : "FS" + shopInfoDO.getShopName() + "(" + signFranchiseDO.getPartnershipSignatoryFirst() + "/"+signFranchiseDO.getPartnershipSignatorySecond()+")"; + return "FS" + shopInfoDO.getShopName(); } // MS10001 if (shopCode.matches("MS\\d*")) { - return partnershipSignatorySecondIsNull - ? "MS" + shopInfoDO.getShopName() + "(" + signFranchiseDO.getPartnershipSignatoryFirst() + ")" - : "MS" + shopInfoDO.getShopName() + "(" + signFranchiseDO.getPartnershipSignatoryFirst() + "/"+signFranchiseDO.getPartnershipSignatorySecond()+")"; + return "MS" + shopInfoDO.getShopName(); } // S10001 if (shopCode.matches("S\\d*")) { - return partnershipSignatorySecondIsNull - ? "S" + shopInfoDO.getShopName() + "(" + signFranchiseDO.getPartnershipSignatoryFirst() + ")" - : "S" + shopInfoDO.getShopName() + "(" + signFranchiseDO.getPartnershipSignatoryFirst() + "/"+signFranchiseDO.getPartnershipSignatorySecond()+")"; + return "S" + shopInfoDO.getShopName(); } // ZX0001 if (shopCode.matches("ZX\\d*")) { return "ZX" + shopInfoDO.getShopName(); } if(shopCode.matches("HL\\d*")){ - return partnershipSignatorySecondIsNull - ? "HL" + shopInfoDO.getShopName() + "(" + signFranchiseDO.getPartnershipSignatoryFirst() + ")" - : "HL" + shopInfoDO.getShopName() + "(" + signFranchiseDO.getPartnershipSignatoryFirst() + "/"+signFranchiseDO.getPartnershipSignatorySecond()+")"; + return "HL" + shopInfoDO.getShopName(); } } if (String.valueOf(FranchiseBrandEnum.MZG.getCode()).equals(shopInfoDO.getFranchiseBrand())) { if (shopCode.matches("MZGM\\d*")) { - return partnershipSignatorySecondIsNull - ? "MZGM" + shopInfoDO.getShopName() + "(" + signFranchiseDO.getPartnershipSignatoryFirst() + ")" - : "MZGM" + shopInfoDO.getShopName() + "(" + signFranchiseDO.getPartnershipSignatoryFirst() + "/"+signFranchiseDO.getPartnershipSignatorySecond()+")"; + return "MZGM" + shopInfoDO.getShopName(); } if (shopCode.matches("MZGS\\d*")) { return FranchiseBrandEnum.MZG.getDesc() + shopInfoDO.getShopName(); @@ -333,19 +321,13 @@ public class SyncDataServiceImpl implements SyncDataService { } if (String.valueOf(FranchiseBrandEnum.ZJS.getCode()).equals(shopInfoDO.getFranchiseBrand())) { if (shopCode.matches("LX\\d*")) { - return partnershipSignatorySecondIsNull - ? "LX" + shopInfoDO.getShopName() + "(" + signFranchiseDO.getPartnershipSignatoryFirst() + ")" - : "LX" + shopInfoDO.getShopName() + "(" + signFranchiseDO.getPartnershipSignatoryFirst() + "/"+signFranchiseDO.getPartnershipSignatorySecond()+")"; + return "LX" + shopInfoDO.getShopName(); } if (shopCode.matches("X\\d*")) { - return partnershipSignatorySecondIsNull - ? "X" + shopInfoDO.getShopName() + "(" + signFranchiseDO.getPartnershipSignatoryFirst() + ")" - : "X" + shopInfoDO.getShopName() + "(" + signFranchiseDO.getPartnershipSignatoryFirst() + "/"+signFranchiseDO.getPartnershipSignatorySecond()+")"; + return "X" + shopInfoDO.getShopName(); } if (shopCode.matches("Q\\d*")) { - return partnershipSignatorySecondIsNull - ? "Q" + shopInfoDO.getShopName() + "(" + signFranchiseDO.getPartnershipSignatoryFirst() + ")" - : "Q" + shopInfoDO.getShopName() + "(" + signFranchiseDO.getPartnershipSignatoryFirst() + "/"+signFranchiseDO.getPartnershipSignatorySecond()+")"; + return "Q" + shopInfoDO.getShopName(); } if (shopCode.matches("Z\\d*")) { return FranchiseBrandEnum.ZJS.getDesc() + shopInfoDO.getShopName();