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 e0b5d847d..607c9ed2d 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 @@ -82,6 +82,7 @@ public enum UserRoleEnum { DEVICE_SHIPMENT_CG(1775108280524L,"设备发货-采购"), OPERATION_VICE_PRESIDENT(1778035765077L, "运营副总裁"), INVESTMENT_PRESIDENT(1778053561302L, "招商副总裁"), + TRAINING(1723516082861L, "培训专员"), ; private Long code; 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 d5af78e28..b5db3b0bf 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 @@ -941,16 +941,14 @@ public class ShopServiceImpl implements ShopService { return Collections.singletonList(new UserDTO(lineInfo.getUsername(), lineInfo.getMobile())); case SHOP_SUB_STAGE_STATUS_11: - case SHOP_SUB_STAGE_STATUS_50: - case SHOP_SUB_STAGE_STATUS_140: - case SHOP_SUB_STAGE_STATUS_141: - case SHOP_SUB_STAGE_STATUS_142: - case SHOP_SUB_STAGE_STATUS_171: case SHOP_SUB_STAGE_STATUS_150_5: return getUserFromInvestmentManager(shopInfo.getInvestmentManager()); case SHOP_SUB_STAGE_STATUS_270: case SHOP_SUB_STAGE_STATUS_274: case SHOP_SUB_STAGE_STATUS_300: + case SHOP_SUB_STAGE_STATUS_140: + case SHOP_SUB_STAGE_STATUS_141: + case SHOP_SUB_STAGE_STATUS_142: return getUserFromInvestmentManager(shopInfo.getOperationsConsultant()); case SHOP_SUB_STAGE_STATUS_310: return getUsersByRolesAndRegion(Collections.singletonList(OPERATION_GENERAL_CONSULTANT), shopInfo.getRegionId()); @@ -1005,6 +1003,10 @@ public class ShopServiceImpl implements ShopService { : UserRoleEnum.FINANCE; return getUsersByRole(financeRole); + case SHOP_SUB_STAGE_STATUS_50: + case SHOP_SUB_STAGE_STATUS_171: + return getUsersByRole(UserRoleEnum.TRAINING); + case SHOP_SUB_STAGE_STATUS_153: return getUsersByRolesAndRegion(Arrays.asList(HEAD_OF_DIVISION, REGIONAL_MANAGER), shopInfo.getRegionId());