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

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

 package com.wwdz.ch.wx.impl;
 
 import com.github.pagehelper.PageInfo;
+import com.wwdz.ch.core.consts.ResultCode;
 import com.wwdz.ch.core.consts.ViewPermissionEnum;
 import com.wwdz.ch.core.type.Result;
 import com.wwdz.ch.core.util.MediaUtil;
@@ -180,7 +181,7 @@ public class FavoritesServiceImpl implements FavoritesService {
         try {
             Favorites favorites = favoritesDao.info(dto.getId());
             if (Objects.isNull(favorites)) {
-                return Result.failed("数据异常，记录不存在");
+                return Result.failed(ResultCode.INVALID_DATA.getCode(), "该收藏册已经被删除");
             }
             FavoritesResponseVo vo = new FavoritesResponseVo();
             vo.setId(favorites.getId());
@@ -234,56 +235,49 @@ public class FavoritesServiceImpl implements FavoritesService {
 
             // 获取仅自己可见的藏品列表
             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());
             page.setHasNextPage(relationPage.isHasNextPage());
-            if (relationPage.getList().isEmpty()) {
-                return Result.success(page);
-            }
-            List<AgentTranceResponseVo> list = new ArrayList<>();
-            for (FavoritesItemsRelation relation : relationPage.getList()) {
-                AgentTranceResponseVo agentTranceResponseVo = new AgentTranceResponseVo();
-                agentTranceResponseVo.setAgentTraceInfo_("");
-                agentTranceResponseVo.setViewType(2);
-
-                ItemResponseVo vo = new ItemResponseVo();
-                Item item = itemDao.findDetails(relation.getItemId());
-                // 设置基本信息
-                vo.setId(relation.getItemId());
-                vo.setName(item.getName());
-                vo.setImages(item.getImages());
-                vo.setDetail(item.getDetail());
-                vo.setFavoritesId(dto.getId());
-                vo.setIsDeleted(item.getIsDeleted());
-                // 设置价格
-                vo.setPrice(getPrice(item.getPrice()));
-                // 设置是否收藏或是否是自己发布的
-                vo.setIsCollected(favoritesItemsRelationDao.isCollected(userId, relation.getItemId(), null) ? 1 : 0);
-                vo.setIsMine(0);
-                if (Objects.nonNull(dto.getUserId()) && dto.getUserId() != 0L) {
-                    if (!isGuest) {
-                        vo.setIsMine(userItemsRelationDao.isExisted(dto.getUserId(), item.getId()) ? 1 : 0);
-                    }
+            if (CollectionUtils.isNotEmpty(relationPage.getList())) {
+                List<AgentTranceResponseVo> list = new ArrayList<>();
+                for (FavoritesItemsRelation relation : relationPage.getList()) {
+                    AgentTranceResponseVo agentTranceResponseVo = new AgentTranceResponseVo();
+                    agentTranceResponseVo.setAgentTraceInfo_("");
+                    agentTranceResponseVo.setViewType(2);
+
+                    ItemResponseVo itemResponseVo = new ItemResponseVo();
+                    Item item = itemDao.findDetails(relation.getItemId());
+                    // 设置基本信息
+                    itemResponseVo.setId(relation.getItemId());
+                    itemResponseVo.setName(item.getName());
+                    itemResponseVo.setImages(item.getImages());
+                    itemResponseVo.setDetail(item.getDetail());
+                    itemResponseVo.setFavoritesId(dto.getId());
+                    itemResponseVo.setIsDeleted(item.getIsDeleted());
+                    itemResponseVo.setViewPermission(item.getViewPermission());
+                    // 设置价格
+                    itemResponseVo.setPrice(getPrice(item.getPrice()));
+                    // 设置是否收藏或是否是自己发布的
+                    itemResponseVo.setIsCollected(favoritesItemsRelationDao.isCollected(userId, relation.getItemId(), null) ? 1 : 0);
+                    itemResponseVo.setIsMine(userItemsRelationDao.isExisted(userId, item.getId()) ? 1 : 0);
+                    // 设置收藏数
+                    long count = favoritesItemsRelationDao.countByItemId(item.getId());
+                    itemResponseVo.setCollectCount(StringUtil.formatCount(count));
+                    // 设置藏品发布用户的昵称和头像
+                    itemCommonService.getNicknameAvatar(item.getId(), itemResponseVo);
+                    // 设置浏览量
+                    itemResponseVo.setViewsNumber(item.getViewPermission().equals(ViewPermissionEnum.ALL.getCode()) ?
+                            StringUtil.formatCount(footPrintDao.countByItemIds(itemResponseVo.getItemUserId(), item.getId(), null)) : "0");
+
+                    // 设置图片或视频
+                    itemResponseVo.setHomePageImage(MediaUtil.getHomePageImage(item.getImages(), item.getVideos()));
+                    agentTranceResponseVo.setDetail(itemResponseVo);
+                    list.add(agentTranceResponseVo);
                 }
-                // 设置收藏数
-                long count = favoritesItemsRelationDao.countByItemId(item.getId());
-                vo.setCollectCount(StringUtil.formatCount(count));
-                // 设置藏品发布用户的昵称和头像
-                itemCommonService.getNicknameAvatar(item.getId(), vo);
-                vo.setViewPermission(item.getViewPermission());
-                // 设置浏览量
-                vo.setViewsNumber(item.getViewPermission().equals(ViewPermissionEnum.ALL.getCode()) ? StringUtil.formatCount(footPrintDao.countByItemIds(vo.getItemUserId(), item.getId(), null)) : "0");
-
-                // 设置图片或视频
-                vo.setHomePageImage(MediaUtil.getHomePageImage(item.getImages(), item.getVideos()));
-                agentTranceResponseVo.setDetail(vo);
-                list.add(agentTranceResponseVo);
+                page.setTotal(favoritesItemsRelationDao.countByFavoritesId(dto.getId()));
+                page.setList(list);
             }
-            page.setTotal(favoritesItemsRelationDao.countByFavoritesId(dto.getId()));
-            page.setList(list);
             logger.info("【请求结束】查看收藏册的藏品列表成功");
             return Result.success(page);
         } catch (Exception e) {