From 98ab7f1a1b4f43fab1413b37dd3871dd1699a3ee Mon Sep 17 00:00:00 2001 From: "shuo.wang" Date: Mon, 26 May 2025 17:10:01 +0800 Subject: [PATCH] =?UTF-8?q?=E4=BA=AC=E4=B8=9C=E5=A4=96=E5=8D=96?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- .../service/impl/OperationLogServiceImpl.java | 1 + .../store/service/impl/PreparationServiceImpl.java | 1 + .../cool/store/service/impl/ShopServiceImpl.java | 14 ++++++++++---- 3 files changed, 12 insertions(+), 4 deletions(-) diff --git a/coolstore-partner-service/src/main/java/com/cool/store/service/impl/OperationLogServiceImpl.java b/coolstore-partner-service/src/main/java/com/cool/store/service/impl/OperationLogServiceImpl.java index 86b39b858..5fe4ac8ad 100644 --- a/coolstore-partner-service/src/main/java/com/cool/store/service/impl/OperationLogServiceImpl.java +++ b/coolstore-partner-service/src/main/java/com/cool/store/service/impl/OperationLogServiceImpl.java @@ -126,6 +126,7 @@ public class OperationLogServiceImpl implements OperationLogService { || operationLogDO.getShopSubStageStatus().equals(ShopSubStageStatusEnum.SHOP_SUB_STAGE_STATUS_201.getShopSubStageStatus()) || operationLogDO.getShopSubStageStatus().equals(ShopSubStageStatusEnum.SHOP_SUB_STAGE_STATUS_213.getShopSubStageStatus()) || operationLogDO.getShopSubStageStatus().equals(ShopSubStageStatusEnum.SHOP_SUB_STAGE_STATUS_221.getShopSubStageStatus()) + || operationLogDO.getShopSubStageStatus().equals(ShopSubStageStatusEnum.SHOP_SUB_STAGE_STATUS_253.getShopSubStageStatus()) ) { auditInfoResponse.setExecute(AuditExecuteEnum.HEADQUARTERS.getCode()); }else { 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 308bd1984..09a5aa02f 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 @@ -251,6 +251,7 @@ public class PreparationServiceImpl implements PreparationService { list.add(ShopSubStageStatusEnum.SHOP_SUB_STAGE_STATUS_200); list.add(ShopSubStageStatusEnum.SHOP_SUB_STAGE_STATUS_210); list.add(ShopSubStageStatusEnum.SHOP_SUB_STAGE_STATUS_220); + list.add(ShopSubStageStatusEnum.SHOP_SUB_STAGE_STATUS_250); shopStageInfoDAO.batchUpdateShopStageStatus(shopId, list); ShopInfoDO shopInfo = shopInfoDAO.getShopInfo(shopId); LineInfoDO lineInfo = lineInfoDAO.getLineInfo(shopInfo.getLineId()); diff --git a/coolstore-partner-service/src/main/java/com/cool/store/service/impl/ShopServiceImpl.java b/coolstore-partner-service/src/main/java/com/cool/store/service/impl/ShopServiceImpl.java index e4146ac51..fd0e2c6d2 100644 --- a/coolstore-partner-service/src/main/java/com/cool/store/service/impl/ShopServiceImpl.java +++ b/coolstore-partner-service/src/main/java/com/cool/store/service/impl/ShopServiceImpl.java @@ -761,6 +761,8 @@ public class ShopServiceImpl implements ShopService { case SHOP_SUB_STAGE_STATUS_214: case SHOP_SUB_STAGE_STATUS_220: case SHOP_SUB_STAGE_STATUS_222: + case SHOP_SUB_STAGE_STATUS_250: + case SHOP_SUB_STAGE_STATUS_254: return Collections.singletonList(new UserDTO(lineInfo.getUsername(), lineInfo.getMobile())); case SHOP_SUB_STAGE_STATUS_11: @@ -836,18 +838,22 @@ public class ShopServiceImpl implements ShopService { return getUsersByRoleAndRegion(DOU_YIN_CUSTOMER, shopInfo.getRegionId()); case SHOP_SUB_STAGE_STATUS_191: - case SHOP_SUB_STAGE_STATUS_193: return getUsersByRoleAndRegion(UserRoleEnum.MEI_TUAN_OPERATIONS_CUSTOMER, shopInfo.getRegionId()); - + case SHOP_SUB_STAGE_STATUS_193: + return getUsersByRoleAndRegion(UserRoleEnum.MEI_TUAN_HEADQUARTERS_BUILD_CUSTOMER, shopInfo.getRegionId()); case SHOP_SUB_STAGE_STATUS_201: return getUsersByRoleAndRegion(UserRoleEnum.MEI_TUAN_BUY_CUSTOMER, shopInfo.getRegionId()); case SHOP_SUB_STAGE_STATUS_211: - case SHOP_SUB_STAGE_STATUS_213: return getUsersByRoleAndRegion(UserRoleEnum.E_L_ME_TUAN_OPERATIONS_CUSTOMER, shopInfo.getRegionId()); - + case SHOP_SUB_STAGE_STATUS_213: + return getUsersByRoleAndRegion(UserRoleEnum.E_L_ME_HEADQUARTERS_BUILD_CUSTOMER, shopInfo.getRegionId()); case SHOP_SUB_STAGE_STATUS_221: return getUsersByRoleAndRegion(UserRoleEnum.KUAI_SHOU_CUSTOMER, shopInfo.getRegionId()); + case SHOP_SUB_STAGE_STATUS_251: + return getUsersByRoleAndRegion(UserRoleEnum.JING_DONG_OPERATIONS_CUSTOMER, shopInfo.getRegionId()); + case SHOP_SUB_STAGE_STATUS_253: + return getUsersByRoleAndRegion(UserRoleEnum.JING_DONG_HEADQUARTERS_BUILD_CUSTOMER, shopInfo.getRegionId()); default: return Collections.emptyList();