1. 保持 boot 和 cloud 的统一

2. 暂时清理 mall 相关的单测,等后续全部适配完,再开启
This commit is contained in:
YunaiV
2023-10-23 23:53:06 +08:00
parent f826d117f8
commit 5b14810626
44 changed files with 19 additions and 5844 deletions

View File

@@ -77,6 +77,7 @@ public class BrokerageUserController {
@PreAuthorize("@ss.hasPermission('trade:brokerage-user:query')")
public CommonResult<BrokerageUserRespVO> getBrokerageUser(@RequestParam("id") Long id) {
BrokerageUserDO brokerageUser = brokerageUserService.getBrokerageUser(id);
// TODO @疯狂:是不是搞成一个统一的 convert
BrokerageUserRespVO respVO = BrokerageUserConvert.INSTANCE.convert(brokerageUser);
return success(BrokerageUserConvert.INSTANCE.copyTo(memberUserApi.getUser(id).getCheckedData(), respVO));
}

View File

@@ -232,7 +232,8 @@ public class BrokerageUserServiceImpl implements BrokerageUserService {
return PageResult.empty();
}
// 1.2 根据昵称过滤下级用户
Map<Long, MemberUserRespDTO> userMap = convertMapByFilter(memberUserApi.getUserList(childIds).getCheckedData(),
List<MemberUserRespDTO> users = memberUserApi.getUserList(childIds).getCheckedData();
Map<Long, MemberUserRespDTO> userMap = convertMapByFilter(users,
user -> StrUtil.contains(user.getNickname(), pageReqVO.getNickname()),
MemberUserRespDTO::getId);
if (CollUtil.isEmpty(userMap)) {