zianxin/Friendship-and-chat-api
1
0 Fork 0
Code Issues Pull Requests Actions Packages Projects Releases Wiki Activity

bug修改

Browse Source
This commit is contained in:
zhoupeng committed 2026-08-24 10:01:08 +08:00
1 parent 0fe485fbc9
commit 07de9f19de
1 file changed
+15 -18
Download Patch File Download Diff File Expand all files Collapse all files
yudao-module-member/yudao-module-member-biz/src/main/java/cn/iocoder/yudao/module/member/service/recent/RecentServiceImpl.java
+15 -18
View File
@@ -205,12 +205,12 @@ public class RecentServiceImpl implements RecentService {
convertRecentPageResVoSetupLocation(result, currentUserLastLocation);
// 用户tag
convertRecentPageResVoSetupTag(result);
if (ObjectUtil.isNotEmpty(result.getUserOperationStatus())) {
Boolean isLookWechat = result.getUserOperationStatus().getIsLookWechat();
if (Boolean.TRUE.equals(isLookWechat)) {
result.getMember().setWechatNum(result.getMember().getWechatNum());
} else {
result.getMember().setWechatNum(result.getMember().getwechatMaskString());
if (ObjectUtil.isNotEmpty(result.getUserOperationStatus())
&& Boolean.TRUE.equals(result.getUserOperationStatus().getIsLookWechat())
&& ObjectUtil.isNotEmpty(result.getMember())) {
MemberWechatBO memberWechat = memberUserService.getMemberWechat(result.getMemberId());
if (ObjectUtil.isNotEmpty(memberWechat)) {
result.getMember().setWechatNum(memberWechat.getWechatNum());
}
}
return result;
@@ -473,7 +473,7 @@ public class RecentServiceImpl implements RecentService {
IPage<RecentPageResVo> recentPageList = recentMapper.pageJoin(new Page(bean.getPageNo(), bean.getPageSize()), resultQuery);
List<RecentPageResVo> resultList = BeanUtils.toBean(recentPageList.getRecords(), RecentPageResVo.class);
// 为RecentPageResVo设置Member信息
convertRecentPageResVoSetupMember(resultList, isVip);
convertRecentPageResVoSetupMember(resultList, false);
// 查询用户tag
convertRecentPageResVoSetupTag(resultList);
// 为RecentPageResVo设置OperationTotal信息
@@ -513,8 +513,8 @@ public class RecentServiceImpl implements RecentService {
}
IPage<RecentPageResVo> recentPageList = recentMapper.pageUserJoin(new Page(bean.getPageNo(), bean.getPageSize()), resultQuery);
List<RecentPageResVo> resultList = BeanUtils.toBean(recentPageList.getRecords(), RecentPageResVo.class);
// 为RecentPageResVo设置Member信息
convertRecentPageResVoSetupMember(resultList, isVip);
// 为RecentPageResVo设置Member信息，微信号统一脱敏；明文只允许通过查看微信接口返回
convertRecentPageResVoSetupMember(resultList, false);
// 如果是`新人``女生`模糊`头像`和`用户名`
List<MemberRecentSceneEnum> dimList = Arrays.asList(MemberRecentSceneEnum.SQUARE_NEW_PERSON, MemberRecentSceneEnum.SQUARE_FEMALE);
// 查询用户tag
@@ -782,9 +782,6 @@ public class RecentServiceImpl implements RecentService {
if (targetUser == null || CommonStatusEnum.isDisable(targetUser.getStatus())) {
throw exception(MemberErrorCode.USER_NOT_EXISTS);
}
// 判断当前操作用户是不是VIP
boolean isVip = openTypeService.isUserOpenType(operateUserId);
RecentPageResVo result = new RecentPageResVo();
result.setMemberId(userId);
// 添加用户信息
@@ -807,12 +804,12 @@ public class RecentServiceImpl implements RecentService {
if (ObjectUtil.isNotEmpty(evaluateDetailResVo)) {
result.setEvaluateDetail(evaluateDetailResVo);
}
if (ObjectUtil.isNotEmpty(result.getUserOperationStatus())) {
Boolean isLookWechat = result.getUserOperationStatus().getIsLookWechat();
if (Boolean.TRUE.equals(isLookWechat)) {
result.getMember().setWechatNum(result.getMember().getWechatNum());
} else {
result.getMember().setWechatNum(result.getMember().getwechatMaskString());
if (ObjectUtil.isNotEmpty(result.getUserOperationStatus())
&& Boolean.TRUE.equals(result.getUserOperationStatus().getIsLookWechat())
&& ObjectUtil.isNotEmpty(result.getMember())) {
MemberWechatBO memberWechat = memberUserService.getMemberWechat(result.getMemberId());
if (ObjectUtil.isNotEmpty(memberWechat)) {
result.getMember().setWechatNum(memberWechat.getWechatNum());
}
}
return result;