Merge remote-tracking branch 'origin/quanku_0930' into quanku_0930

ch-wx-api/src/main/java/com/wwdz/ch/wx/entity/vo/FavoritesResponseVo.java

@@ -17,4 +17,5 @@ public class FavoritesResponseVo implements Entity {
     private Boolean deleted;
     private List<String> images;
     private long count;
+    private Boolean isGuest;
 }

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

@@ -13,6 +13,7 @@ import com.wwdz.ch.wx.entity.request.ItemRequestDto;
 import com.wwdz.ch.wx.entity.vo.AgentTranceResponseVo;
 import com.wwdz.ch.wx.entity.vo.FavoritesResponseVo;
 import com.wwdz.ch.wx.entity.vo.ItemResponseVo;
+import com.wwdz.ch.wx.manager.UserTokenManager;
 import com.wwdz.ch.wx.service.FavoritesService;
 import com.wwdz.ch.wx.service.ItemCommonService;
 import com.wwdz.ch.wx.util.StringUtil;
@@ -44,6 +45,8 @@ public class FavoritesServiceImpl implements FavoritesService {
     private FootPrintDao footPrintDao;
     @Autowired
     private ItemCommonService itemCommonService;
+    @Autowired
+    private UserTokenManager userTokenManager;
 
     @Override
     public Result page(FavoritesRequestDto dto, HttpServletRequest request) {
@@ -189,6 +192,10 @@ public class FavoritesServiceImpl implements FavoritesService {
             vo.setCount(favoritesItemsRelationDao.countByFavoritesId(favorites.getId()));
             // 设置封面图
             vo.setImages(getFavoritesImage(favorites.getId(), request.getHeader("Authorization")));
+            // 是否客态
+            Long userId = userTokenManager.getUserId(request.getHeader("Authorization"));
+            boolean isGuest = !favorites.getUserId().equals(userId);
+            vo.setIsGuest(isGuest);
             logger.info("【请求结束】查看收藏册详情成功");
             return Result.success(vo);
         } catch (Exception e) {
@@ -223,6 +230,9 @@ public class FavoritesServiceImpl implements FavoritesService {
             page.setList(new ArrayList<>());
 
             // 获取仅自己可见的藏品列表
+            Long userId = userTokenManager.getUserId(request.getHeader("Authorization"));
+            // 是否客态
+            boolean isGuest = !dto.getUserId().equals(userId);
             List<Long> onlyOneselfItemIds = itemCommonService.getOnlyOneselfItemIds(request.getHeader("Authorization"));
             // 分页查询
             PageInfo<FavoritesItemsRelation> relationPage = favoritesItemsRelationDao.pageByFavoritesId(dto.getId(), onlyOneselfItemIds, dto.getPage(), dto.getSize());
@@ -252,7 +262,9 @@ public class FavoritesServiceImpl implements FavoritesService {
                 vo.setIsMine(0);
                 if (Objects.nonNull(dto.getUserId()) && dto.getUserId() != 0L) {
                     vo.setIsCollected(favoritesItemsRelationDao.isCollected(dto.getUserId(), relation.getItemId(), null) ? 1 : 0);
-                    vo.setIsMine(userItemsRelationDao.isExisted(dto.getUserId(), item.getId()) ? 1 : 0);
+                    if (!isGuest) {
+                        vo.setIsMine(userItemsRelationDao.isExisted(dto.getUserId(), item.getId()) ? 1 : 0);
+                    }
                 }
                 // 设置收藏数
                 long count = favoritesItemsRelationDao.countByItemId(item.getId());

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

@@ -213,7 +213,8 @@ public class ItemServiceImpl implements ItemService {
                 nickname = user.getNickname();
                 avatar = user.getAvatar();
             }
-            boolean isGuest = dto.getUserId().equals(userId);
+            // 是否客态
+            boolean isGuest = !dto.getUserId().equals(userId);
             if (!officialUserIds.contains(dto.getUserId())) {
                 // 查询用户和藏品关联表
                 List<UserItemsRelation> userItemsRelations = userItemsRelationDao.listByUserIds(dto.getUserId(), null);
@@ -250,10 +251,7 @@ public class ItemServiceImpl implements ItemService {
                     vo.setHomePageImage(MediaUtil.getHomePageImage(item.getImages(), item.getVideos()));
                     // 设置是否收藏和是否是自己发布的
                     vo.setIsCollected(0);
-                    vo.setIsMine(1);
-                    if (isGuest) {
-                        vo.setIsMine(0);
-                    }
+                    vo.setIsMine(isGuest ? 0 : 1);
                     vo.setIsCollected(favoritesItemsRelationDao.isCollected(dto.getUserId(), item.getId(), null) ? 1 : 0);
                     // 设置收藏数
                     long count = favoritesItemsRelationDao.countByItemId(item.getId());
@@ -301,10 +299,7 @@ public class ItemServiceImpl implements ItemService {
                         // 设置图片或视频
                         vo.setHomePageImage(MediaUtil.getHomePageImage(es.getImages(), es.getVideos()));
                         // 设置是否收藏和是否是自己发布的
-                        vo.setIsMine(1);
-                        if (isGuest) {
-                            vo.setIsMine(0);
-                        }
+                        vo.setIsMine(isGuest ? 0 : 1);
                         vo.setIsCollected(favoritesItemsRelationDao.isCollected(dto.getUserId(), es.getId(), null) ? 1 : 0);
                         // 设置收藏数
                         long count = favoritesItemsRelationDao.countByItemId(es.getId());