From 99f6b3cf3bab524ea880947ef66817ba47bc3179 Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?=E8=8B=8F=E7=AB=B9=E7=BA=A2?= Date: Wed, 19 Jun 2024 19:24:27 +0800 Subject: [PATCH] OA --- .../service/impl/PreparationServiceImpl.java | 23 +++++++++---------- .../impl/SignFranchiseServiceImpl.java | 2 ++ 2 files changed, 13 insertions(+), 12 deletions(-) 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 508ff42a3..58e51c930 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 @@ -192,8 +192,7 @@ public class PreparationServiceImpl implements PreparationService { if (CollectionUtils.isNotEmpty(shopStageInfo)) { Map shopStageInfoDOMap = shopStageInfo.stream().collect(Collectors.toMap(ShopStageInfoDO::getShopSubStage, data -> data)); Boolean buildStoreCompletionFlag = Boolean.TRUE; - Boolean contractCompletionFlag = ShopSubStageStatusEnum.SHOP_SUB_STAGE_STATUS_73.getShopSubStageStatus().equals(shopStageInfoDOMap.get(ShopSubStageEnum.SHOP_STAGE_7.getShopSubStage()).getShopSubStageStatus()); - ShopInfoDO shopInfo = shopInfoDAO.getShopInfo(shopId); + Boolean contractCompletionFlag = ShopSubStageStatusEnum.SHOP_SUB_STAGE_STATUS_84.getShopSubStageStatus().equals(shopStageInfoDOMap.get(ShopSubStageEnum.SHOP_STAGE_8.getShopSubStage()).getShopSubStageStatus()); //都完成了 初始化后续流程数据 if (buildStoreCompletionFlag && contractCompletionFlag) { //初始化后续流程数据 设计阶段 装修阶段 开业运营方案 首批订货清单 @@ -201,17 +200,17 @@ public class PreparationServiceImpl implements PreparationService { ShopStageInfoDO data1 = shopStageInfoDOMap.get(ShopSubStageEnum.SHOP_STAGE_9.getShopSubStage()); data1.setShopSubStageStatus(ShopSubStageStatusEnum.SHOP_SUB_STAGE_STATUS_90.getShopSubStageStatus()); list.add(data1); - ShopStageInfoDO data2 = shopStageInfoDOMap.get(ShopSubStageEnum.SHOP_STAGE_11.getShopSubStage()); - data2.setShopSubStageStatus(ShopSubStageStatusEnum.SHOP_SUB_STAGE_STATUS_110.getShopSubStageStatus()); - list.add(data2); +// ShopStageInfoDO data2 = shopStageInfoDOMap.get(ShopSubStageEnum.SHOP_STAGE_11.getShopSubStage()); +// data2.setShopSubStageStatus(ShopSubStageStatusEnum.SHOP_SUB_STAGE_STATUS_110.getShopSubStageStatus()); +// list.add(data2); //初始化xfsg_acceptance_info表 - AcceptanceInfoDO acceptanceInfoDO1 = acceptanceInfoDAO.selectByShopId(shopId); - AcceptanceInfoDO acceptanceInfoDO = new AcceptanceInfoDO(); - acceptanceInfoDO.setShopId(shopId); - acceptanceInfoDO.setCreateTime(new Date()); - if(Objects.isNull(acceptanceInfoDO1)) { - acceptanceInfoDAO.insertSelectiveAcceptanceInfo(acceptanceInfoDO); - } +// AcceptanceInfoDO acceptanceInfoDO1 = acceptanceInfoDAO.selectByShopId(shopId); +// AcceptanceInfoDO acceptanceInfoDO = new AcceptanceInfoDO(); +// acceptanceInfoDO.setShopId(shopId); +// acceptanceInfoDO.setCreateTime(new Date()); +// if(Objects.isNull(acceptanceInfoDO1)) { +// acceptanceInfoDAO.insertSelectiveAcceptanceInfo(acceptanceInfoDO); +// } ShopStageInfoDO data3 = shopStageInfoDOMap.get(ShopSubStageEnum.SHOP_STAGE_14.getShopSubStage()); data3.setShopSubStageStatus(ShopSubStageStatusEnum.SHOP_SUB_STAGE_STATUS_140.getShopSubStageStatus()); list.add(data3); 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 d30d1b429..6e67ba30b 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 @@ -167,6 +167,8 @@ public class SignFranchiseServiceImpl implements SignFranchiseService, AuditResu lineInfoMapper.insertOrUpdate(lineInfoDO); //todo 提交之后先直接到已签约 正常是待审核 shopStageInfoDAO.updateShopStageInfo(request.getShopId(), ShopSubStageStatusEnum.SHOP_SUB_STAGE_STATUS_84); + //如果加盟合同完成 开始设计阶段与验收阶段 + preparationService.contractAndBuildStoreCompletion(request.getShopId()); return new ResponseResult(200000,"提交成功"); } else { throw new ServiceException(ErrorCodeEnum.DUPLICATE_SUBMISSION);