suzhuhong/zxjp-web
1
0
Fork 0
Code Issues Pull Requests Actions Packages Projects Releases Wiki Activity

feat:建店品牌负责人通知

Browse Source
This commit is contained in:
苏竹红
2025-05-19 14:26:31 +08:00
parent 8b892bfc9b
commit 8c8fd75d73
3 changed files with 5 additions and 4 deletions
Download Patch File Download Diff File Expand all files Collapse all files

2
coolstore-partner-common/src/main/java/com/cool/store/enums/UserRoleEnum.java
View File

@@ -62,6 +62,8 @@ public enum UserRoleEnum {
QUOTATION_OFFICE(470000000L,"报价员"), QUOTATION_OFFICE(470000000L,"报价员"),
OWN_SHOP_OFFICE(480000000L,"自有店财务"), OWN_SHOP_OFFICE(480000000L,"自有店财务"),
BRAND_HEAD(490000000L,"品牌负责人"),
; ;
private Long code; private Long code;

2
coolstore-partner-service/src/main/java/com/cool/store/service/impl/DeskServiceImpl.java
View File

@@ -568,7 +568,7 @@ public class DeskServiceImpl implements DeskService {
if (userRoleIds.contains(UserRoleEnum.HEAD_OF_DIVISION.getCode()) || userRoleIds.contains(UserRoleEnum.REGIONAL_MANAGER.getCode())) { if (userRoleIds.contains(UserRoleEnum.HEAD_OF_DIVISION.getCode()) || userRoleIds.contains(UserRoleEnum.REGIONAL_MANAGER.getCode())) {
subStageStatusList.add(ShopSubStageStatusEnum.SHOP_SUB_STAGE_STATUS_153.getShopSubStageStatus()); 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()); subStageStatusList.add(ShopSubStageStatusEnum.SHOP_SUB_STAGE_STATUS_154.getShopSubStageStatus());
} }
if (userRoleIds.contains(UserRoleEnum.PRESIDENT.getCode())) { if (userRoleIds.contains(UserRoleEnum.PRESIDENT.getCode())) {

5
coolstore-partner-service/src/main/java/com/cool/store/service/impl/OrderSysInfoServiceImpl.java
View File

@@ -27,8 +27,7 @@ import java.util.*;
import java.util.stream.Collectors; import java.util.stream.Collectors;
import java.util.stream.Stream; import java.util.stream.Stream;
import static com.cool.store.enums.UserRoleEnum.PRESIDENT; import static com.cool.store.enums.UserRoleEnum.*;
import static com.cool.store.enums.UserRoleEnum.VICE_PRESIDENT_IN_CHARGE;
import static com.cool.store.enums.point.ShopSubStageStatusEnum.*; import static com.cool.store.enums.point.ShopSubStageStatusEnum.*;
/** /**
@@ -206,7 +205,7 @@ public class OrderSysInfoServiceImpl implements OrderSysInfoService {
switch (nowStatus) { switch (nowStatus) {
case SHOP_SUB_STAGE_STATUS_153: case SHOP_SUB_STAGE_STATUS_153:
nextStatus = SHOP_SUB_STAGE_STATUS_154; nextStatus = SHOP_SUB_STAGE_STATUS_154;
List<EnterpriseUserDO> users = userAuthMappingService.getAllUserByRoleEnumAndRegionId(VICE_PRESIDENT_IN_CHARGE, shopInfoDAO.getShopInfo(request.getShopId()).getRegionId()); List<EnterpriseUserDO> users = userAuthMappingService.getUserIdByRoleEnumAndRegionId(Arrays.asList(VICE_PRESIDENT_IN_CHARGE,BRAND_HEAD), shopInfoDAO.getShopInfo(request.getShopId()).getRegionId());
List<String> userIds = new ArrayList<>(); List<String> userIds = new ArrayList<>();
if(CollectionUtils.isNotEmpty(users)){ if(CollectionUtils.isNotEmpty(users)){
userIds = users.stream().map(EnterpriseUserDO::getUserId).collect(Collectors.toList()); userIds = users.stream().map(EnterpriseUserDO::getUserId).collect(Collectors.toList());