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 32b726da5..5a3e07fa6 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 @@ -63,6 +63,12 @@ public class ShopStageInfoDAO { if (shopSubStageEnum.equals(ShopSubStageEnum.SHOP_STAGE_14)) { continue; } + if (!CommonConstants.INDEX_ONE.equals(shopInfoDO.getUseStandardStore()) + && !String.valueOf(FranchiseBrandEnum.ZXJP.getCode()).equals(shopInfoDO.getFranchiseBrand()) + && ShopSubStageEnum.SHOP_STAGE_6.equals(shopSubStageEnum)) { + // 不是标准店且不是正新鸡排的情况下,不开启网商钱包开通阶段 + 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/ApplyLicenseServiceImpl.java b/coolstore-partner-service/src/main/java/com/cool/store/service/impl/ApplyLicenseServiceImpl.java index 119c63028..157d0ab78 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 @@ -116,9 +116,9 @@ public class ApplyLicenseServiceImpl implements ApplyLicenseService { if (!acquired) { throw new ServiceException(ErrorCodeEnum.DUPLICATE_SUBMISSION); } + ShopInfoDO shopInfo = shopInfoDAO.getShopInfo(request.getShopId()); if (request.getLegalIsSamePartner()){ // 法人身份证信息和加盟商一致 - ShopInfoDO shopInfo = shopInfoDAO.getShopInfo(request.getShopId()); LineInfoDO lineInfoDO = lineInfoMapper.getByLineId(shopInfo.getLineId()); if ( ! lineInfoDO.getUsername().equals(request.getLicenseLegalPerson())){ throw new ServiceException(ErrorCodeEnum.LEGAL_PERSON_NAME_NOT_SAME); @@ -148,7 +148,10 @@ public class ApplyLicenseServiceImpl implements ApplyLicenseService { preparationService.buildStoreAndDecorationComplete(request.getShopId()); preparationService.selectSiteAndBuildStoreComplete(request.getShopId()); } - addTagIfUploadLicense(request.getShopId()); + if (CommonConstants.INDEX_ONE.equals(shopInfo.getUseStandardStore()) + || String.valueOf(FranchiseBrandEnum.ZXJP.getCode()).equals(shopInfo.getFranchiseBrand())) { + addTagIfUploadLicense(request.getShopId()); + } return Boolean.TRUE; } diff --git a/coolstore-partner-service/src/main/java/com/cool/store/service/impl/PointServiceImpl.java b/coolstore-partner-service/src/main/java/com/cool/store/service/impl/PointServiceImpl.java index 55130c1f6..988dca926 100644 --- a/coolstore-partner-service/src/main/java/com/cool/store/service/impl/PointServiceImpl.java +++ b/coolstore-partner-service/src/main/java/com/cool/store/service/impl/PointServiceImpl.java @@ -1337,8 +1337,13 @@ public class PointServiceImpl implements PointService { shopInfoDAO.updateShopInfo(updateShop); //如果是通过 将钱包阶段状态从未开始改为已开始 已开始的不需要处理 ShopStageInfoDO walletStage = shopStageInfoDAO.getShopSubStageInfo(request.getShopId(), ShopSubStageEnum.SHOP_STAGE_6); - if (ShopSubStageStatusEnum.SHOP_SUB_STAGE_STATUS_00.getShopSubStageStatus().equals(walletStage.getShopSubStageStatus())) { + if (Objects.nonNull(walletStage) && ShopSubStageStatusEnum.SHOP_SUB_STAGE_STATUS_00.getShopSubStageStatus().equals(walletStage.getShopSubStageStatus())) { shopStageInfoDAO.updateShopStageInfo(request.getShopId(),ShopSubStageStatusEnum.SHOP_SUB_STAGE_STATUS_60); + } else { + ShopStageInfoDO payStage = shopStageInfoDAO.getShopSubStageInfo(request.getShopId(), ShopSubStageEnum.SHOP_STAGE_7); + if (ShopSubStageStatusEnum.SHOP_SUB_STAGE_STATUS_00.getShopSubStageStatus().equals(payStage.getShopSubStageStatus())) { + shopStageInfoDAO.updateShopStageInfo(request.getShopId(), ShopSubStageStatusEnum.SHOP_SUB_STAGE_STATUS_70); + } } } shopStageInfoDAO.updateShopStageAndAuditInfo(shopId, subStageStatus, auditId);