Skip to content

GitLab

Q
qk_backend
Commit e29f414a authored by muhong's avatar muhong
Browse files
Options

修改 藏品和收藏册部分逻辑

parent de4b6615
Hide whitespace changes
Inline Side-by-side
Showing with 153 additions and 163 deletions
ch-wx-api/src/main/java/com/wwdz/ch/wx/impl/FavoritesServiceImpl.java
View file @ e29f414a
......@@ -235,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) {
......
ch-wx-api/src/main/java/com/wwdz/ch/wx/impl/ItemServiceImpl.java
View file @ e29f414a
......@@ -158,35 +158,35 @@ public class ItemServiceImpl implements ItemService {
List<AgentTranceResponseVo> resultList = new ArrayList<>();
esPageInfo.getDataList().forEach(s -> {
ItemResponseVo vo = new ItemResponseVo();
ItemResponseVo itemResponseVo = new ItemResponseVo();
ItemOfEs es = (ItemOfEs) s;
// 设置基本信息
vo.setId(es.getId());
vo.setName(es.getName());
vo.setDetail(es.getDetail());
vo.setSourceType(es.getSourceType());
itemResponseVo.setId(es.getId());
itemResponseVo.setName(es.getName());
itemResponseVo.setDetail(es.getDetail());
itemResponseVo.setSourceType(es.getSourceType());
itemResponseVo.setViewPermission(0);
// 设置价格
vo.setPrice(getPrice(es.getPrice()));
itemResponseVo.setPrice(getPrice(es.getPrice()));
// 设置图片或视频
vo.setHomePageImage(MediaUtil.getHomePageImage(es.getImages(), es.getVideos()));
itemResponseVo.setHomePageImage(MediaUtil.getHomePageImage(es.getImages(), es.getVideos()));
// 设置是否收藏和是否是自己发布的
vo.setIsCollected(0);
vo.setIsMine(0);
itemResponseVo.setIsCollected(0);
itemResponseVo.setIsMine(0);
if (Objects.nonNull(dto.getUserId()) && !dto.getUserId().equals(0L)) {
vo.setIsCollected(favoritesItemsRelationDao.isCollected(dto.getUserId(), es.getId(), null) ? 1 : 0);
vo.setIsMine(userItemsRelationDao.isExisted(dto.getUserId(), es.getId()) ? 1 : 0);
itemResponseVo.setIsCollected(favoritesItemsRelationDao.isCollected(dto.getUserId(), es.getId(), null) ? 1 : 0);
itemResponseVo.setIsMine(userItemsRelationDao.isExisted(dto.getUserId(), es.getId()) ? 1 : 0);
}
// 设置收藏数
long count = favoritesItemsRelationDao.countByItemId(es.getId());
vo.setCollectCount(StringUtil.formatCount(count));
itemResponseVo.setCollectCount(StringUtil.formatCount(count));
// 设置藏品发布用户的昵称和头像
itemCommonService.getNicknameAvatar(es.getId(), vo);
vo.setViewPermission(0);
itemCommonService.getNicknameAvatar(es.getId(), itemResponseVo);
AgentTranceResponseVo agentTranceResponseVo = new AgentTranceResponseVo();
agentTranceResponseVo.setAgentTraceInfo_("");
agentTranceResponseVo.setViewType(1);
agentTranceResponseVo.setDetail(vo);
agentTranceResponseVo.setDetail(itemResponseVo);
resultList.add(agentTranceResponseVo);
});
result.setList(resultList);
......@@ -201,8 +201,6 @@ public class ItemServiceImpl implements ItemService {
@Override
public Result myPage(ItemRequestDto dto, HttpServletRequest request) {
try {
Long userId = userTokenManager.getUserId(request.getHeader("Authorization"));
PageInfo<AgentTranceResponseVo> result = new PageInfo<>();
result.setPageNum(dto.getPage());
result.setPageSize(dto.getSize());
......@@ -219,6 +217,7 @@ public class ItemServiceImpl implements ItemService {
avatar = user.getAvatar();
}
// 是否客态
Long userId = userTokenManager.getUserId(request.getHeader("Authorization"));
boolean isGuest = !dto.getUserId().equals(userId);
// 获取官方用户id
List<ItemsOfficialUsersRelation> itemsOfficialUsersRelations = itemsOfficialUsersRelationDao.list();
......@@ -244,45 +243,44 @@ public class ItemServiceImpl implements ItemService {
coinRequestDto.setViewPermission(dto.getViewPermission());
// 分页查询
PageInfo<Item> pageInfo = itemDao.findPageNotDeleted(coinRequestDto);
if (CollectionUtils.isEmpty(pageInfo.getList())) {
return Result.success(result);
}
result.setTotal(pageInfo.getTotal());
result.setHasNextPage(pageInfo.isHasNextPage());
if (CollectionUtils.isNotEmpty(pageInfo.getList())) {
result.setTotal(pageInfo.getTotal());
result.setHasNextPage(pageInfo.isHasNextPage());
List<AgentTranceResponseVo> resultList = new ArrayList<>();
for (Item item : pageInfo.getList()) {
ItemResponseVo vo = new ItemResponseVo();
// 设置基本信息
vo.setId(item.getId());
vo.setName(item.getName());
vo.setDetail(item.getDetail());
vo.setSourceType(item.getSourceType());
// 设置价格
vo.setPrice(getPrice(item.getPrice()));
// 设置图片或视频
vo.setHomePageImage(MediaUtil.getHomePageImage(item.getImages(), item.getVideos()));
// 设置是否收藏和是否是自己发布的
vo.setIsCollected(0);
vo.setIsMine(isGuest ? 0 : 1);
vo.setIsCollected(favoritesItemsRelationDao.isCollected(userId, item.getId(), null) ? 1 : 0);
// 设置收藏数
long count = favoritesItemsRelationDao.countByItemId(item.getId());
vo.setCollectCount(StringUtil.formatCount(count));
// 设置用户头像和昵称
vo.setItemNickname(nickname);
vo.setItemAvatar(avatar);
vo.setViewPermission(item.getViewPermission());
// 设置浏览量
vo.setViewsNumber(item.getViewPermission().equals(ViewPermissionEnum.ALL.getCode()) ? StringUtil.formatCount(footPrintDao.countByItemIds(dto.getUserId(), item.getId(), null)) : "0");
List<AgentTranceResponseVo> resultList = new ArrayList<>();
for (Item item : pageInfo.getList()) {
ItemResponseVo itemResponseVo = new ItemResponseVo();
// 设置基本信息
itemResponseVo.setId(item.getId());
itemResponseVo.setName(item.getName());
itemResponseVo.setDetail(item.getDetail());
itemResponseVo.setSourceType(item.getSourceType());
itemResponseVo.setViewPermission(item.getViewPermission());
// 设置价格
itemResponseVo.setPrice(getPrice(item.getPrice()));
// 设置图片或视频
itemResponseVo.setHomePageImage(MediaUtil.getHomePageImage(item.getImages(), item.getVideos()));
// 设置是否收藏和是否是自己发布的
itemResponseVo.setIsCollected(favoritesItemsRelationDao.isCollected(userId, item.getId(), null) ? 1 : 0);
itemResponseVo.setIsMine(isGuest ? 0 : 1);
// 设置收藏数
long count = favoritesItemsRelationDao.countByItemId(item.getId());
itemResponseVo.setCollectCount(StringUtil.formatCount(count));
// 设置用户头像和昵称
itemResponseVo.setItemNickname(nickname);
itemResponseVo.setItemAvatar(avatar);
// 设置浏览量
itemResponseVo.setViewsNumber(item.getViewPermission().equals(ViewPermissionEnum.ALL.getCode()) ?
StringUtil.formatCount(footPrintDao.countByItemIds(dto.getUserId(), item.getId(), null)) : "0");
AgentTranceResponseVo agentTranceResponseVo = new AgentTranceResponseVo();
agentTranceResponseVo.setAgentTraceInfo_("");
agentTranceResponseVo.setViewType(1);
agentTranceResponseVo.setDetail(vo);
resultList.add(agentTranceResponseVo);
AgentTranceResponseVo agentTranceResponseVo = new AgentTranceResponseVo();
agentTranceResponseVo.setAgentTraceInfo_("");
agentTranceResponseVo.setViewType(1);
agentTranceResponseVo.setDetail(itemResponseVo);
resultList.add(agentTranceResponseVo);
}
result.setList(resultList);
}
result.setList(resultList);
} else {
ItemsOfficialUsersRelation itemsOfficialUsersRelation = itemsOfficialUsersRelationDao.findItems(dto.getUserId());
if (Objects.nonNull(itemsOfficialUsersRelation)) {
......@@ -300,34 +298,34 @@ public class ItemServiceImpl implements ItemService {
final String itemNickname = nickname;
final String itemAvatar = avatar;
esPageInfo.getDataList().forEach(s -> {
ItemResponseVo vo = new ItemResponseVo();
ItemResponseVo itemResponseVo = new ItemResponseVo();
ItemOfEs es = (ItemOfEs) s;
// 设置基本信息
vo.setId(es.getId());
vo.setName(es.getName());
vo.setDetail(es.getDetail());
vo.setSourceType(es.getSourceType());
itemResponseVo.setId(es.getId());
itemResponseVo.setName(es.getName());
itemResponseVo.setDetail(es.getDetail());
itemResponseVo.setSourceType(es.getSourceType());
itemResponseVo.setViewPermission(0);
// 设置价格
vo.setPrice(getPrice(es.getPrice()));
itemResponseVo.setPrice(getPrice(es.getPrice()));
// 设置图片或视频
vo.setHomePageImage(MediaUtil.getHomePageImage(es.getImages(), es.getVideos()));
itemResponseVo.setHomePageImage(MediaUtil.getHomePageImage(es.getImages(), es.getVideos()));
// 设置是否收藏和是否是自己发布的
vo.setIsMine(isGuest ? 0 : 1);
vo.setIsCollected(favoritesItemsRelationDao.isCollected(userId, es.getId(), null) ? 1 : 0);
itemResponseVo.setIsCollected(favoritesItemsRelationDao.isCollected(userId, es.getId(), null) ? 1 : 0);
itemResponseVo.setIsMine(isGuest ? 0 : 1);
// 设置收藏数
long count = favoritesItemsRelationDao.countByItemId(es.getId());
vo.setCollectCount(StringUtil.formatCount(count));
itemResponseVo.setCollectCount(StringUtil.formatCount(count));
// 设置藏品发布用户的昵称和头像
vo.setItemNickname(itemNickname);
vo.setItemAvatar(itemAvatar);
vo.setViewPermission(0);
itemResponseVo.setItemNickname(itemNickname);
itemResponseVo.setItemAvatar(itemAvatar);
// 设置浏览量
vo.setViewsNumber(StringUtil.formatCount(footPrintDao.countByItemIds(dto.getUserId(), es.getId(), null)));
itemResponseVo.setViewsNumber(StringUtil.formatCount(footPrintDao.countByItemIds(dto.getUserId(), es.getId(), null)));
AgentTranceResponseVo agentTranceResponseVo = new AgentTranceResponseVo();
agentTranceResponseVo.setAgentTraceInfo_("");
agentTranceResponseVo.setViewType(1);
agentTranceResponseVo.setDetail(vo);
agentTranceResponseVo.setDetail(itemResponseVo);
resultList.add(agentTranceResponseVo);
});
result.setList(resultList);
......@@ -351,64 +349,63 @@ public class ItemServiceImpl implements ItemService {
result.setList(new ArrayList<>());
result.setHasNextPage(false);
// 获取仅自己可见的藏品列表
Long userId = userTokenManager.getUserId(request.getHeader("Authorization"));
// 是否客态
Long userId = userTokenManager.getUserId(request.getHeader("Authorization"));
boolean isGuest = !dto.getUserId().equals(userId);
// 获取仅自己可见的藏品列表
List<Long> onlyOneselfItemIds = itemCommonService.getOnlyOneselfItemIds(request.getHeader("Authorization"));
List<Long> onlyOneselfItemIds = itemCommonService.getOnlyOneselfItemIdsByUserId(userId);
// 分页查询
PageInfo<FavoritesItemsRelation> pageInfo = favoritesItemsRelationDao.pageByUserId(dto.getUserId(), onlyOneselfItemIds, dto.getType(), dto.getPage(), dto.getSize());
if (CollectionUtils.isEmpty(pageInfo.getList())) {
return Result.success(result);
}
result.setTotal(pageInfo.getTotal());
result.setHasNextPage(pageInfo.isHasNextPage());
// 获取查询结果对应的藏品列表
List<Long> itemIds = pageInfo.getList().stream()
.map(FavoritesItemsRelation::getItemId).collect(Collectors.toList());
CoinRequestDto coinRequestDto = new CoinRequestDto();
coinRequestDto.setIds(itemIds);
List<Item> itemList = itemDao.findList(coinRequestDto);
Map<Long, Item> itemMap = itemList.stream()
.collect(Collectors.toMap(Item::getId, s -> s, (k1, k2) -> k2));
// 包装结果
List<AgentTranceResponseVo> resultList = new ArrayList<>();
for (FavoritesItemsRelation favoritesItemsRelation : pageInfo.getList()) {
ItemResponseVo itemResponseVo = new ItemResponseVo();
Item item = itemMap.get(favoritesItemsRelation.getItemId());
// 设置基本信息
itemResponseVo.setId(item.getId());
itemResponseVo.setName(item.getName());
itemResponseVo.setImages(item.getImages());
itemResponseVo.setDetail(item.getDetail());
itemResponseVo.setIsDeleted(item.getIsDeleted());
// 设置价格
itemResponseVo.setPrice(getPrice(item.getPrice()));
// 设置是否收藏或是否是自己发布的
itemResponseVo.setIsCollected(0);
itemResponseVo.setIsMine(0);
if (!isGuest) {
itemResponseVo.setIsMine(userItemsRelationDao.isExisted(dto.getUserId(), item.getId()) ? 1 : 0);
}
itemResponseVo.setIsCollected(favoritesItemsRelationDao.isCollected(userId, item.getId(), null) ? 1 : 0);
// 设置收藏数
long count = favoritesItemsRelationDao.countByItemId(item.getId());
itemResponseVo.setCollectCount(StringUtil.formatCount(count));
// 设置图片或视频
itemResponseVo.setHomePageImage(MediaUtil.getHomePageImage(item.getImages(), item.getVideos()));
// 设置发布藏品用户的昵称和头像
itemCommonService.getNicknameAvatar(item.getId(), itemResponseVo);
itemResponseVo.setViewPermission(item.getViewPermission());
if (CollectionUtils.isNotEmpty(pageInfo.getList())) {
result.setTotal(pageInfo.getTotal());
result.setHasNextPage(pageInfo.isHasNextPage());
AgentTranceResponseVo agentTranceResponseVo = new AgentTranceResponseVo();
agentTranceResponseVo.setAgentTraceInfo_("");
agentTranceResponseVo.setViewType(1);
agentTranceResponseVo.setDetail(itemResponseVo);
resultList.add(agentTranceResponseVo);
// 获取查询结果对应的藏品列表
List<Long> itemIds = pageInfo.getList().stream()
.map(FavoritesItemsRelation::getItemId).collect(Collectors.toList());
CoinRequestDto coinRequestDto = new CoinRequestDto();
coinRequestDto.setIds(itemIds);
List<Item> itemList = itemDao.findList(coinRequestDto);
Map<Long, Item> itemMap = itemList.stream()
.collect(Collectors.toMap(Item::getId, s -> s, (k1, k2) -> k2));
// 包装结果
List<AgentTranceResponseVo> resultList = new ArrayList<>();
for (FavoritesItemsRelation favoritesItemsRelation : pageInfo.getList()) {
ItemResponseVo itemResponseVo = new ItemResponseVo();
Item item = itemMap.get(favoritesItemsRelation.getItemId());
// 设置基本信息
itemResponseVo.setId(item.getId());
itemResponseVo.setName(item.getName());
itemResponseVo.setImages(item.getImages());
itemResponseVo.setDetail(item.getDetail());
itemResponseVo.setIsDeleted(item.getIsDeleted());
itemResponseVo.setViewPermission(item.getViewPermission());
// 设置价格
itemResponseVo.setPrice(getPrice(item.getPrice()));
// 设置是否收藏或是否是自己发布的
if (isGuest) {
itemResponseVo.setIsCollected(favoritesItemsRelationDao.isCollected(userId, item.getId(), null) ? 1 : 0);
} else {
itemResponseVo.setIsCollected(1);
}
itemResponseVo.setIsMine(userItemsRelationDao.isExisted(userId, item.getId()) ? 1 : 0);
// 设置收藏数
long count = favoritesItemsRelationDao.countByItemId(item.getId());
itemResponseVo.setCollectCount(StringUtil.formatCount(count));
// 设置图片或视频
itemResponseVo.setHomePageImage(MediaUtil.getHomePageImage(item.getImages(), item.getVideos()));
// 设置发布藏品用户的昵称和头像
itemCommonService.getNicknameAvatar(item.getId(), itemResponseVo);
AgentTranceResponseVo agentTranceResponseVo = new AgentTranceResponseVo();
agentTranceResponseVo.setAgentTraceInfo_("");
agentTranceResponseVo.setViewType(1);
agentTranceResponseVo.setDetail(itemResponseVo);
resultList.add(agentTranceResponseVo);
}
result.setList(resultList);
}
result.setList(resultList);
logger.info("【请求结束】查询全部收藏成功");
return Result.success(result);
} catch (Exception e) {
......
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