修改 列表增加权限，登录接口返回简介

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

@@ -259,6 +259,7 @@ public class FavoritesServiceImpl implements FavoritesService {
                 vo.setCollectCount(StringUtil.formatCount(count));
                 // 设置藏品发布用户的昵称和头像
                 itemCommonService.getNicknameAvatar(item.getId(), vo);
+                vo.setViewPermission(item.getViewPermission());
 
                 // 设置图片或视频
                 vo.setHomePageImage(MediaUtil.getHomePageImage(item.getImages(), item.getVideos()));

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

@@ -14,6 +14,7 @@ import com.wwdz.ch.wx.entity.request.FootPrintRequestDto;
 import com.wwdz.ch.wx.entity.vo.AgentTranceResponseVo;
 import com.wwdz.ch.wx.entity.vo.ItemResponseVo;
 import com.wwdz.ch.wx.service.FootPrintService;
+import com.wwdz.ch.wx.service.ItemCommonService;
 import com.wwdz.ch.wx.util.StringUtil;
 import com.xxdxxs.utils.DateUtils;
 import org.apache.commons.collections.CollectionUtils;
@@ -38,6 +39,8 @@ public class FootPrintServiceImpl implements FootPrintService {
     private FavoritesItemsRelationDao favoritesItemsRelationDao;
     @Autowired
     private UserItemsRelationDao userItemsRelationDao;
+    @Autowired
+    private ItemCommonService itemCommonService;
 
     @Override
     public Result page(FootPrintRequestDto dto) {
@@ -107,6 +110,9 @@ public class FootPrintServiceImpl implements FootPrintService {
                 itemResponseVo.setCollectCount(StringUtil.formatCount(count));
                 // 设置图片或视频
                 itemResponseVo.setHomePageImage(MediaUtil.getHomePageImage(item.getImages(), item.getVideos()));
+                // 设置藏品的发布用户昵称和头像
+                itemCommonService.getNicknameAvatar(item.getId(), itemResponseVo);
+                itemResponseVo.setViewPermission(item.getViewPermission());
 
                 // 设置日期类型
                 if (footprint.getUpdateTime().compareTo(today) >= 0) {

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

@@ -172,6 +172,8 @@ public class ItemServiceImpl implements ItemService {
                 vo.setCollectCount(StringUtil.formatCount(count));
                 // 设置藏品发布用户的昵称和头像
                 itemCommonService.getNicknameAvatar(es.getId(), vo);
+                //TODO 从es里获取
+                vo.setViewPermission(0);
 
                 AgentTranceResponseVo agentTranceResponseVo = new AgentTranceResponseVo();
                 agentTranceResponseVo.setAgentTraceInfo_("");
@@ -251,6 +253,7 @@ public class ItemServiceImpl implements ItemService {
                 // 设置用户头像和昵称
                 vo.setItemNickname(nickname);
                 vo.setItemAvatar(avatar);
+                vo.setViewPermission(item.getViewPermission());
 
                 AgentTranceResponseVo agentTranceResponseVo = new AgentTranceResponseVo();
                 agentTranceResponseVo.setAgentTraceInfo_("");
@@ -318,6 +321,7 @@ public class ItemServiceImpl implements ItemService {
                 itemResponseVo.setHomePageImage(MediaUtil.getHomePageImage(item.getImages(), item.getVideos()));
                 // 设置发布藏品用户的昵称和头像
                 itemCommonService.getNicknameAvatar(item.getId(), itemResponseVo);
+                itemResponseVo.setViewPermission(item.getViewPermission());
 
                 AgentTranceResponseVo agentTranceResponseVo = new AgentTranceResponseVo();
                 agentTranceResponseVo.setAgentTraceInfo_("");
@@ -555,6 +559,13 @@ public class ItemServiceImpl implements ItemService {
             if (Objects.isNull(item)) {
                 return Result.failed("该藏品已删除，不支持收藏");
             }
+            // 权限校验
+            UserItemsRelation userItemsRelation = userItemsRelationDao.find(item.getId());
+            if (item.getViewPermission().equals(ViewPermissionEnum.ONLY_ONESELF.getCode())) {
+                if (Objects.nonNull(userItemsRelation) && !userItemsRelation.getUserId().equals(dto.getUserId())) {
+                    return Result.failed("暂无权限收藏该藏品");
+                }
+            }
             // 判断是否收藏过
             if (favoritesItemsRelationDao.isCollected(dto.getUserId(), dto.getId(), null)) {
                 return Result.failed("您已经收藏过该藏品");

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

@@ -492,6 +492,8 @@ public class UserServiceImpl implements UserService {
         userInfo.setUserId(user.getId());
         userInfo.setPhone(user.getMobile());
         userInfo.setAvatarUrl(user.getAvatar());
+        userInfo.setProfile(user.getProfile());
+        userInfo.setBackground(user.getBackground());
         userInfo.setGender(user.getGender());
         userInfo.setNickName(user.getNickname());
         userInfo.setWechatId(user.getWechatId());