|
@@ -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;
|
|
|
}
|
|
|
|
|
|
}
|