diff --git a/coolstore-partner-dao/src/main/java/com/cool/store/mapper/SysRoleMapper.java b/coolstore-partner-dao/src/main/java/com/cool/store/mapper/SysRoleMapper.java index 725ebf2c6..25e230f13 100644 --- a/coolstore-partner-dao/src/main/java/com/cool/store/mapper/SysRoleMapper.java +++ b/coolstore-partner-dao/src/main/java/com/cool/store/mapper/SysRoleMapper.java @@ -136,4 +136,6 @@ public interface SysRoleMapper { */ List selectBySynDingRoleIdAndSource( @Param("source") String source, @Param("synDingRoleId") Long synDingRoleId); + List getRolesByNamesAndSource(@Param("roleNames") List roleNames, @Param("source") String source); + } diff --git a/coolstore-partner-dao/src/main/resources/mapper/SysRoleMapper.xml b/coolstore-partner-dao/src/main/resources/mapper/SysRoleMapper.xml index a4c277339..863b4681f 100644 --- a/coolstore-partner-dao/src/main/resources/mapper/SysRoleMapper.xml +++ b/coolstore-partner-dao/src/main/resources/mapper/SysRoleMapper.xml @@ -347,4 +347,16 @@ ORDER BY priority + + \ No newline at end of file diff --git a/coolstore-partner-service/src/main/java/com/cool/store/service/SysRoleService.java b/coolstore-partner-service/src/main/java/com/cool/store/service/SysRoleService.java index f153785cb..215ff08e0 100644 --- a/coolstore-partner-service/src/main/java/com/cool/store/service/SysRoleService.java +++ b/coolstore-partner-service/src/main/java/com/cool/store/service/SysRoleService.java @@ -1,8 +1,12 @@ package com.cool.store.service; +import java.util.Map; + public interface SysRoleService { Boolean checkIsAdmin(String userId); + Map getXfsgRoles(); + } diff --git a/coolstore-partner-service/src/main/java/com/cool/store/service/impl/LinePayServiceImpl.java b/coolstore-partner-service/src/main/java/com/cool/store/service/impl/LinePayServiceImpl.java index 59c10c53b..9f3b63433 100644 --- a/coolstore-partner-service/src/main/java/com/cool/store/service/impl/LinePayServiceImpl.java +++ b/coolstore-partner-service/src/main/java/com/cool/store/service/impl/LinePayServiceImpl.java @@ -65,7 +65,7 @@ public class LinePayServiceImpl implements LinePayService { fillLinePay(false, linePayDO, request, partnerUser); linePayDAO.updateLinePay(linePayDO); } - + lineInfo.setWorkflowSubStage(WorkflowSubStageEnum.PAY_DEPOSIT.getCode()); lineInfo.setWorkflowSubStageStatus(WorkflowSubStageStatusEnum.PAY_DEPOSIT_50.getCode()); lineInfoMapper.insertOrUpdate(lineInfo); diff --git a/coolstore-partner-service/src/main/java/com/cool/store/service/impl/SysRoleServiceImpl.java b/coolstore-partner-service/src/main/java/com/cool/store/service/impl/SysRoleServiceImpl.java index 5e6dd5d6c..2c30e803d 100644 --- a/coolstore-partner-service/src/main/java/com/cool/store/service/impl/SysRoleServiceImpl.java +++ b/coolstore-partner-service/src/main/java/com/cool/store/service/impl/SysRoleServiceImpl.java @@ -2,6 +2,8 @@ package com.cool.store.service.impl; 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 lombok.extern.slf4j.Slf4j; @@ -10,7 +12,10 @@ import org.apache.commons.lang3.StringUtils; import org.springframework.stereotype.Service; import javax.annotation.Resource; +import java.util.Arrays; import java.util.List; +import java.util.Map; +import java.util.stream.Collectors; /** * 角色service @@ -33,5 +38,15 @@ public class SysRoleServiceImpl implements SysRoleService { .anyMatch(role-> StringUtils.equals(Role.MASTER.getRoleEnum(),role.getRoleEnum())); } + @Override + public Map getXfsgRoles() { + List xfsgRoleNames = Arrays.stream(UserRoleEnum.values()) + .map(UserRoleEnum::getDesc) + .collect(Collectors.toList()); + List sysRoleDOList = sysRoleMapper.getRolesByNamesAndSource(xfsgRoleNames, RoleSourceEnum.CREATE.getCode()); + Map sysRoleDOMap = sysRoleDOList.stream().collect(Collectors.toMap(k -> k.getRoleName(), v -> v.getId(), (k1, k2) -> k1)); + return sysRoleDOMap; + } + } diff --git a/coolstore-partner-web/src/main/java/com/cool/store/controller/webb/SysRoleController.java b/coolstore-partner-web/src/main/java/com/cool/store/controller/webb/SysRoleController.java new file mode 100644 index 000000000..7397b211a --- /dev/null +++ b/coolstore-partner-web/src/main/java/com/cool/store/controller/webb/SysRoleController.java @@ -0,0 +1,27 @@ +package com.cool.store.controller.webb; + +import com.cool.store.response.ResponseResult; +import com.cool.store.service.SysRoleService; +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.RestController; + +import java.util.Map; + +@RestController +@RequestMapping("/pc/sysRole") +@Api(tags = "角色信息") +@Slf4j +public class SysRoleController { + @Autowired + private SysRoleService sysRoleService; + + @GetMapping(path = "/getXfsgRoles") + public ResponseResult> getXfsgRoles() { + return ResponseResult.success(sysRoleService.getXfsgRoles()); + } + +}