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

Merge remote-tracking branch 'origin/cc_partner_init' into cc_partner_init

Browse Source
This commit is contained in:
zhangchenbiao
2024-04-22 10:43:39 +08:00
parent 54f2b1c82a bd196c8802
commit c50888d461
3 changed files with 26 additions and 0 deletions
Download Patch File Download Diff File Expand all files Collapse all files

15
coolstore-partner-service/src/main/java/com/cool/store/service/impl/SysRoleServiceImpl.java
View File

@@ -1,12 +1,15 @@
package com.cool.store.service.impl;
import com.cool.store.entity.EnterpriseUserDO;
import com.cool.store.entity.SysRoleDO;
import com.cool.store.enums.Role;
import com.cool.store.enums.RoleSourceEnum;
import com.cool.store.enums.UserRoleEnum;
import com.cool.store.mapper.SysRoleMapper;
import com.cool.store.service.SysRoleService;
import com.cool.store.service.UserAuthMappingService;
import lombok.extern.slf4j.Slf4j;
import org.apache.commons.collections4.CollectionUtils;
import org.apache.commons.collections4.ListUtils;
import org.apache.commons.lang3.StringUtils;
import org.springframework.stereotype.Service;
@@ -28,6 +31,9 @@ public class SysRoleServiceImpl implements SysRoleService {
@Resource
private SysRoleMapper sysRoleMapper;
@Resource
private UserAuthMappingService userAuthMappingService;
@Override
public Boolean checkIsAdmin(String userId) {
// 1.取出所有用户角色
@@ -50,6 +56,15 @@ public class SysRoleServiceImpl implements SysRoleService {
@Override
public String getUserIdByRegionIdWithRolePriority(Long regionId, List<UserRoleEnum> roleList) {
if(CollectionUtils.isEmpty(roleList)){
return null;
}
for(UserRoleEnum roleEnum: roleList){
EnterpriseUserDO enterpriseUserDO = userAuthMappingService.getUserByRoleEnumAndRegionId(roleEnum, regionId);
if(enterpriseUserDO != null){
return enterpriseUserDO.getUserId();
}
}
return null;
}

1
coolstore-partner-service/src/main/java/com/cool/store/service/impl/TrainingExperienceServiceImpl.java
View File

@@ -111,6 +111,7 @@ public class TrainingExperienceServiceImpl extends LineFlowService implements Tr
LeaseBaseInfoDO leaseBaseInfoDO = trainingExperienceMapper.selectByLineId(lineId);
if (Objects.isNull(leaseBaseInfoDO)) {
leaseBaseInfoDO = new LeaseBaseInfoDO();
LineInfoDO lineInfoDO = lineInfoMapper.getByLineId(lineId);
if (Objects.nonNull(lineInfoDO)
&& lineInfoDO.getWorkflowSubStage().equals(WorkflowSubStageEnum.STORE_EXPERIENCE.getCode())

10
coolstore-partner-web/src/main/java/com/cool/store/controller/webb/SysRoleController.java
View File

@@ -1,14 +1,19 @@
package com.cool.store.controller.webb;
import com.cool.store.enums.UserRoleEnum;
import com.cool.store.response.ResponseResult;
import com.cool.store.service.SysRoleService;
import com.google.common.collect.Lists;
import io.swagger.annotations.Api;
import lombok.extern.slf4j.Slf4j;
import org.springframework.beans.factory.annotation.Autowired;
import org.springframework.web.bind.annotation.GetMapping;
import org.springframework.web.bind.annotation.RequestMapping;
import org.springframework.web.bind.annotation.RequestParam;
import org.springframework.web.bind.annotation.RestController;
import java.util.Arrays;
import java.util.List;
import java.util.Map;
@RestController
@@ -24,4 +29,9 @@ public class SysRoleController {
return ResponseResult.success(sysRoleService.getXfsgRoles());
}
@GetMapping(path = "/getUserIdByRegionIdWithRolePriority")
public ResponseResult<String> getUserIdByRegionIdWithRolePriority(@RequestParam(value = "regionId", required = true) Long regionId) {
List<UserRoleEnum> roleList = Arrays.asList(UserRoleEnum.THEATER_MANAGER, UserRoleEnum.OPERATIONS_MANAGER, UserRoleEnum.REGION_MANAGER);
return ResponseResult.success(sysRoleService.getUserIdByRegionIdWithRolePriority(regionId, roleList));
}
}