Commit 827ae18a authored by muhong's avatar muhong

修改 收藏册藏品列表

parent dbd33291
......@@ -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) {
......@@ -223,6 +226,8 @@ 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 +257,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());
......
Markdown is supported
0%
or
You are about to add 0 people to the discussion. Proceed with caution.
Finish editing this message first!
Please register or to comment