From e1a1cb5616503bf7e0e8f474bcafe3626c132986 Mon Sep 17 00:00:00 2001 From: wangff Date: Fri, 24 Oct 2025 14:53:24 +0800 Subject: [PATCH] =?UTF-8?q?fix:POS=E5=BC=80=E9=80=9A=E8=B5=84=E6=96=99?= =?UTF-8?q?=E6=94=B6=E9=9B=86=E4=B8=AD=E8=BD=AC=E8=B5=84=E6=96=99=E5=AE=A1?= =?UTF-8?q?=E6=A0=B8=E4=B8=AD=E6=9D=A1=E4=BB=B6=E4=BF=AE=E6=94=B9?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- .../java/com/cool/store/service/PreparationService.java | 1 + .../cool/store/service/impl/ApplyLicenseServiceImpl.java | 1 + .../com/cool/store/service/impl/PreparationServiceImpl.java | 6 ++++-- 3 files changed, 6 insertions(+), 2 deletions(-) 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 0ed4e8cdb..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 @@ -95,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 e3d006f49..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 @@ -142,6 +142,7 @@ public class ApplyLicenseServiceImpl implements ApplyLicenseService { 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/PreparationServiceImpl.java b/coolstore-partner-service/src/main/java/com/cool/store/service/impl/PreparationServiceImpl.java index 5739aa6d2..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 @@ -361,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); } }