新增 公开、私密数量

ch-wx-api/src/main/java/com/wwdz/ch/wx/dao/UserInfo.java

@@ -32,6 +32,8 @@ public class UserInfo implements Serializable {
 	private String fansNumber;
 	private long collectionsNumber;
 	private long viewsNumber;
+	private long allNumber;
+	private long privacyNumber;
 	private String collectionsViewsNumber;
 	private Boolean isFollowed;
 	private Integer followedId;
@@ -190,6 +192,22 @@ public class UserInfo implements Serializable {
 		this.viewsNumber = viewsNumber;
 	}
 
+	public long getAllNumber() {
+		return allNumber;
+	}
+
+	public void setAllNumber(long allNumber) {
+		this.allNumber = allNumber;
+	}
+
+	public long getPrivacyNumber() {
+		return privacyNumber;
+	}
+
+	public void setPrivacyNumber(long privacyNumber) {
+		this.privacyNumber = privacyNumber;
+	}
+
 	public Boolean getIsFollowed() {
 		return isFollowed;
 	}

ch-wx-api/src/main/java/com/wwdz/ch/wx/impl/ItemCommonServiceImpl.java

 package com.wwdz.ch.wx.impl;
 
+import com.wwdz.ch.core.consts.ViewPermissionEnum;
 import com.wwdz.ch.core.type.Result;
 import com.wwdz.ch.db.dao.*;
+import com.wwdz.ch.db.domain.Item;
 import com.wwdz.ch.db.domain.ItemsOfficialUsersRelation;
 import com.wwdz.ch.db.domain.User;
 import com.wwdz.ch.db.domain.UserItemsRelation;
+import com.wwdz.ch.db.dto.request.CoinRequestDto;
 import com.wwdz.ch.db.dto.request.FollowFansRecordRequestDto;
 import com.wwdz.ch.wx.dao.UserInfo;
 import com.wwdz.ch.wx.entity.vo.ItemResponseVo;
@@ -70,6 +73,8 @@ public class ItemCommonServiceImpl implements ItemCommonService {
         long fansNumber = 0;
         long collectionsNumber = 0;
         long viewsNumber = 0;
+        long allNumber = 0;
+        long privacyNumber = 0;
         // 关注和粉丝数量
         FollowFansRecordRequestDto followFansRecordRequestDto = new FollowFansRecordRequestDto();
         followFansRecordRequestDto.setSearchTargetId(userInfo.getUserId());
@@ -79,13 +84,18 @@ public class ItemCommonServiceImpl implements ItemCommonService {
             followersNumber = (long) map.get("followerNum");
             fansNumber = (long) map.get("fansNum");
         }
-        // 收藏和浏览量
+        // 收藏和浏览量、所有人私密数量
         List<UserItemsRelation> userItemsRelations = userItemsRelationDao.listByUserIds(userInfo.getUserId(), null);
         if (CollectionUtils.isNotEmpty(userItemsRelations)) {
             List<Long> itemIds = userItemsRelations.stream()
                     .map(UserItemsRelation::getItemId).collect(Collectors.toList());
             collectionsNumber = favoritesItemsRelationDao.countByItemIds(itemIds);
             viewsNumber = footPrintDao.countByItemIds(itemIds);
+            CoinRequestDto coinRequestDto = new CoinRequestDto();
+            coinRequestDto.setIds(itemIds);
+            List<Item> itemList = itemDao.findListNotDeleted(coinRequestDto);
+            allNumber = itemList.stream().filter(s -> s.getViewPermission().equals(ViewPermissionEnum.ALL.getCode())).count();
+            privacyNumber = itemList.stream().filter(s -> s.getViewPermission().equals(ViewPermissionEnum.ONLY_ONESELF.getCode())).count();
         }
 
         userInfo.setCollectionsNumber(collectionsNumber);
@@ -93,5 +103,7 @@ public class ItemCommonServiceImpl implements ItemCommonService {
         userInfo.setFollowersNumber(StringUtil.formatCount(followersNumber));
         userInfo.setFansNumber(StringUtil.formatCount(fansNumber));
         userInfo.setCollectionsViewsNumber(StringUtil.formatCount(collectionsNumber + viewsNumber));
+        userInfo.setAllNumber(allNumber);
+        userInfo.setPrivacyNumber(privacyNumber);
     }
 }