wyh
/
surprise
1
0
Fork 0
Code Issues Pull Requests Packages Projects Releases Wiki Activity

~

main
linhw 2024-05-16 14:16:31 +08:00
parent d209830640
commit 91e47af5b8
2 changed files with 18 additions and 14 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

5
server/like-common/src/main/java/com/mdd/common/vo/CircleDetailVo.java
View File

@ -63,7 +63,6 @@ public class CircleDetailVo implements Serializable {
@ApiModelProperty(value = "是否加入1是2否") @ApiModelProperty(value = "是否加入1是2否")
private Integer is_join; private Integer is_join;
@ApiModelProperty(value = "用户头像，存在多张用逗号分开")
private String imgUrls;
} }

27
server/like-front/src/main/java/com/mdd/front/service/impl/AppCircleServiceImpl.java
View File

@ -6,12 +6,8 @@ import com.baomidou.mybatisplus.extension.plugins.pagination.Page;
import com.github.pagehelper.PageHelper; import com.github.pagehelper.PageHelper;
import com.github.pagehelper.PageInfo; import com.github.pagehelper.PageInfo;
import com.mdd.common.core.AjaxResult; import com.mdd.common.core.AjaxResult;
import com.mdd.common.entity.AppCircleAddress; import com.mdd.common.entity.*;
import com.mdd.common.entity.AppCircleUser; import com.mdd.common.mapper.*;
import com.mdd.common.entity.AppFriend;
import com.mdd.common.mapper.AppCircleAddressMapper;
import com.mdd.common.mapper.AppCircleUserMapper;
import com.mdd.common.mapper.AppFriendMapper;
import com.mdd.common.vo.AppCircleVo; import com.mdd.common.vo.AppCircleVo;
import com.mdd.common.vo.CircleDetailVo; import com.mdd.common.vo.CircleDetailVo;
import com.mdd.front.validate.common.PageValidate; import com.mdd.front.validate.common.PageValidate;
@ -22,8 +18,6 @@ import com.mdd.front.validate.AppCircleSearchValidate;
import com.mdd.front.vo.AppCircleDetailVo; import com.mdd.front.vo.AppCircleDetailVo;
import com.mdd.common.core.PageResult; import com.mdd.common.core.PageResult;
import com.mdd.common.entity.AppCircle;
import com.mdd.common.mapper.AppCircleMapper;
import com.mdd.common.util.TimeUtils; import com.mdd.common.util.TimeUtils;
import com.mdd.front.vo.AppCircleListedVo; import com.mdd.front.vo.AppCircleListedVo;
import io.swagger.models.auth.In; import io.swagger.models.auth.In;
@ -56,6 +50,9 @@ public class AppCircleServiceImpl implements IAppCircleService {
@Resource @Resource
AppFriendMapper appFriendMapper; AppFriendMapper appFriendMapper;
@Resource
AppUserMapper appUserMapper;
/** /**
* 圈子信息列表 * 圈子信息列表
* *
@ -225,13 +222,21 @@ public class AppCircleServiceImpl implements IAppCircleService {
.eq("user_id",userId) .eq("user_id",userId)
); );
Integer friendNum = 0; Integer friendNum = 0;
List<Integer> friendIds = friends.stream().map(x->x.getFriendId()).collect(Collectors.toList()); for (AppFriend friend : friends) {
for (Integer friendId : friendIds) { if (ids.contains(friend.getFriendId())) {
if (ids.contains(friendId)) {
friendNum = friendNum + 1; friendNum = friendNum + 1;
} }
} }
model.setFriendNum(friendNum); model.setFriendNum(friendNum);
StringBuilder imgUrls = new StringBuilder();
for (int i = 0; i < ids.size(); i++) {
if (i < 3) {
AppUser appUser = appUserMapper.selectById(ids.get(i));
imgUrls.append(appUser.getAvatar());
imgUrls.append(",");
}
}
model.setImgUrls(imgUrls.toString());
return model; return model;
} }