From 8c8fd75d73ceccb619613d217d5028fb79d7fbc1 Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?=E8=8B=8F=E7=AB=B9=E7=BA=A2?= Date: Mon, 19 May 2025 14:26:31 +0800 Subject: [PATCH] =?UTF-8?q?feat:=E5=BB=BA=E5=BA=97=E5=93=81=E7=89=8C?= =?UTF-8?q?=E8=B4=9F=E8=B4=A3=E4=BA=BA=E9=80=9A=E7=9F=A5?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- .../src/main/java/com/cool/store/enums/UserRoleEnum.java | 2 ++ .../java/com/cool/store/service/impl/DeskServiceImpl.java | 2 +- .../com/cool/store/service/impl/OrderSysInfoServiceImpl.java | 5 ++--- 3 files changed, 5 insertions(+), 4 deletions(-) diff --git a/coolstore-partner-common/src/main/java/com/cool/store/enums/UserRoleEnum.java b/coolstore-partner-common/src/main/java/com/cool/store/enums/UserRoleEnum.java index 74e04dba4..636f95d8c 100644 --- a/coolstore-partner-common/src/main/java/com/cool/store/enums/UserRoleEnum.java +++ b/coolstore-partner-common/src/main/java/com/cool/store/enums/UserRoleEnum.java @@ -62,6 +62,8 @@ public enum UserRoleEnum { QUOTATION_OFFICE(470000000L,"报价员"), OWN_SHOP_OFFICE(480000000L,"自有店财务"), + + BRAND_HEAD(490000000L,"品牌负责人"), ; private Long code; diff --git a/coolstore-partner-service/src/main/java/com/cool/store/service/impl/DeskServiceImpl.java b/coolstore-partner-service/src/main/java/com/cool/store/service/impl/DeskServiceImpl.java index 6cb7b933d..40f4f2904 100644 --- a/coolstore-partner-service/src/main/java/com/cool/store/service/impl/DeskServiceImpl.java +++ b/coolstore-partner-service/src/main/java/com/cool/store/service/impl/DeskServiceImpl.java @@ -568,7 +568,7 @@ public class DeskServiceImpl implements DeskService { if (userRoleIds.contains(UserRoleEnum.HEAD_OF_DIVISION.getCode()) || userRoleIds.contains(UserRoleEnum.REGIONAL_MANAGER.getCode())) { subStageStatusList.add(ShopSubStageStatusEnum.SHOP_SUB_STAGE_STATUS_153.getShopSubStageStatus()); } - if (userRoleIds.contains(UserRoleEnum.VICE_PRESIDENT_IN_CHARGE.getCode())) { + if (userRoleIds.contains(UserRoleEnum.VICE_PRESIDENT_IN_CHARGE.getCode()) || userRoleIds.contains(UserRoleEnum.BRAND_HEAD.getCode())) { subStageStatusList.add(ShopSubStageStatusEnum.SHOP_SUB_STAGE_STATUS_154.getShopSubStageStatus()); } if (userRoleIds.contains(UserRoleEnum.PRESIDENT.getCode())) { 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 18d27b750..46819be9e 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 @@ -27,8 +27,7 @@ import java.util.*; import java.util.stream.Collectors; import java.util.stream.Stream; -import static com.cool.store.enums.UserRoleEnum.PRESIDENT; -import static com.cool.store.enums.UserRoleEnum.VICE_PRESIDENT_IN_CHARGE; +import static com.cool.store.enums.UserRoleEnum.*; import static com.cool.store.enums.point.ShopSubStageStatusEnum.*; /** @@ -206,7 +205,7 @@ public class OrderSysInfoServiceImpl implements OrderSysInfoService { switch (nowStatus) { case SHOP_SUB_STAGE_STATUS_153: nextStatus = SHOP_SUB_STAGE_STATUS_154; - List users = userAuthMappingService.getAllUserByRoleEnumAndRegionId(VICE_PRESIDENT_IN_CHARGE, shopInfoDAO.getShopInfo(request.getShopId()).getRegionId()); + List users = userAuthMappingService.getUserIdByRoleEnumAndRegionId(Arrays.asList(VICE_PRESIDENT_IN_CHARGE,BRAND_HEAD), shopInfoDAO.getShopInfo(request.getShopId()).getRegionId()); List userIds = new ArrayList<>(); if(CollectionUtils.isNotEmpty(users)){ userIds = users.stream().map(EnterpriseUserDO::getUserId).collect(Collectors.toList());