Merge branch 'dev/2024/0424/update-business' of Harper/feifan-backend-zx-business into master

修改商户下的用户角色名称展示

feifan-module-sale/feifan-module-sale-biz/src/main/java/cn/newfeifan/mall/sale/service/shop/ShopServiceImpl.java

@@ -2,12 +2,11 @@ package cn.newfeifan.mall.sale.service.shop;
 
 import cn.newfeifan.mall.framework.common.exception.util.ServiceExceptionUtil;
 import cn.newfeifan.mall.framework.common.util.json.JsonUtils;
-import cn.newfeifan.mall.module.enums.ErrorCodeConstants;
 import cn.newfeifan.mall.module.system.controller.admin.user.vo.user.UserRespVO;
-import cn.newfeifan.mall.module.system.dal.dataobject.oauth2.OAuth2AccessTokenDO;
 import cn.newfeifan.mall.module.system.dal.dataobject.user.AdminUserDO;
 import cn.newfeifan.mall.module.system.dal.mysql.user.AdminUserMapper;
 import cn.newfeifan.mall.module.system.dal.redis.oauth2.OAuth2AccessTokenRedisDAO;
+import cn.newfeifan.mall.module.system.service.permission.RoleService;
 import cn.newfeifan.mall.module.system.service.user.AdminUserService;
 import cn.newfeifan.mall.sale.controller.admin.shop.vo.ShopPageReqVO;
 import cn.newfeifan.mall.sale.controller.admin.shop.vo.ShopRespVO;
@@ -47,6 +46,8 @@ public class ShopServiceImpl implements ShopService {
     private ShopMapper shopMapper;
     @Resource
     private AdminUserMapper userMapper;
+    @Resource
+    private RoleService roleService;
 
     @Override
     public Long createShop(ShopSaveReqVO createReqVO) {
@@ -126,7 +127,6 @@ public class ShopServiceImpl implements ShopService {
     public List<UserRespVO> getAllUser(List<Long> shopIds) {
 
         List<AdminUserDO> userRespVO = userService.getUserByShopIds(shopIds);
-
         return BeanUtils.toBean(userRespVO, UserRespVO.class);
     }
 
@@ -165,8 +165,11 @@ public class ShopServiceImpl implements ShopService {
     @Override
     public List<UserRespVO> getAllUserByMerId(Long merId) {
         List<AdminUserDO> userRespVO = userService.getUserByMerId(merId);
-
-        return BeanUtils.toBean(userRespVO, UserRespVO.class);
+        List<UserRespVO> respVOS = BeanUtils.toBean(userRespVO, UserRespVO.class);
+        for (UserRespVO respVO : respVOS) {
+            respVO.setRoleName(roleService.getRoleNames(respVO.getId()));
+        }
+        return  respVOS;
     }
 
 }

feifan-module-system/feifan-module-system-biz/src/main/java/cn/newfeifan/mall/module/system/controller/admin/user/vo/user/UserRespVO.java

@@ -9,6 +9,7 @@ import io.swagger.v3.oas.annotations.media.Schema;
 import lombok.Data;
 
 import java.time.LocalDateTime;
+import java.util.List;
 import java.util.Set;
 
 @Schema(description = "管理后台 - 用户信息 Response VO")
@@ -82,7 +83,8 @@ public class UserRespVO{
     @Schema(description = "店铺id", example = "9887")
     private Long shopId;
 
-
+    @Schema(description = "角色名称")
+    private List<String> roleName;
 
 
 

feifan-module-system/feifan-module-system-biz/src/main/java/cn/newfeifan/mall/module/system/dal/mysql/permission/RoleMapper.java

@@ -9,8 +9,10 @@ import cn.newfeifan.mall.module.system.dal.dataobject.permission.RoleDO;
 import org.apache.ibatis.annotations.Mapper;
 import org.springframework.lang.Nullable;
 
+import java.util.ArrayList;
 import java.util.Collection;
 import java.util.List;
+import java.util.Set;
 
 @Mapper
 public interface RoleMapper extends BaseMapperX<RoleDO> {
@@ -36,5 +38,15 @@ public interface RoleMapper extends BaseMapperX<RoleDO> {
     default List<RoleDO> selectListByStatus(@Nullable Collection<Integer> statuses) {
         return selectList(RoleDO::getStatus, statuses);
     }
+    default List<String> selectByRoleIds(Set<Long> roleIds){
+        List<RoleDO> roleDOS = selectList(new LambdaQueryWrapperX<RoleDO>()
+                .inIfPresent(RoleDO::getId, roleIds));
+        List<String> strings = new ArrayList<>();
+        for (RoleDO roleDO : roleDOS) {
+            strings.add(roleDO.getName());
+        }
+        return strings;
+    }
+
 
 }

feifan-module-system/feifan-module-system-biz/src/main/java/cn/newfeifan/mall/module/system/service/permission/RoleService.java

@@ -129,4 +129,6 @@ public interface RoleService {
      */
     void validateRoleList(Collection<Long> ids);
 
+    List<String> getRoleNames(Long userId);
+
 }

feifan-module-system/feifan-module-system-biz/src/main/java/cn/newfeifan/mall/module/system/service/permission/RoleServiceImpl.java

@@ -247,4 +247,10 @@ public class RoleServiceImpl implements RoleService {
         return SpringUtil.getBean(getClass());
     }
 
+    @Override
+    public List<String> getRoleNames(Long userId) {
+        Set<Long> roleIds = permissionService.getUserRoleIdListByUserId(userId);
+        return roleMapper.selectByRoleIds(roleIds);
+    }
+
 }