Skip to content

GitLab

Q
qk_backend
Commit 0dcee256 authored by shiyu's avatar shiyu
Browse files
Options

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

parents 3d1c126f 950959f5
Hide whitespace changes
Inline Side-by-side
Showing with 108 additions and 52 deletions
ch-wx-api/src/main/java/com/wwdz/ch/wx/entity/vo/ItemResponseVo.java
View file @ 0dcee256
...@@ -27,6 +27,7 @@ public class ItemResponseVo implements Entity { ...@@ -27,6 +27,7 @@ public class ItemResponseVo implements Entity {
private Boolean isDeleted; private Boolean isDeleted;
private String itemAvatar; private String itemAvatar;
private String itemNickname; private String itemNickname;
private Long itemUserId;
private String profile; private String profile;
private Integer timeType; private Integer timeType;
private List<Map<String, Object>> imagesList; private List<Map<String, Object>> imagesList;
......
ch-wx-api/src/main/java/com/wwdz/ch/wx/impl/ItemCommonServiceImpl.java
View file @ 0dcee256
...@@ -56,6 +56,7 @@ public class ItemCommonServiceImpl implements ItemCommonService { ...@@ -56,6 +56,7 @@ public class ItemCommonServiceImpl implements ItemCommonService {
user = userDao.queryById(itemsOfficialUsersRelation.getUserId()); user = userDao.queryById(itemsOfficialUsersRelation.getUserId());
} }
} }
vo.setItemUserId(Objects.nonNull(user) ? user.getId() : null);
vo.setItemNickname(Objects.nonNull(user) ? user.getNickname() : ""); vo.setItemNickname(Objects.nonNull(user) ? user.getNickname() : "");
vo.setItemAvatar(Objects.nonNull(user) ? user.getAvatar() : ""); vo.setItemAvatar(Objects.nonNull(user) ? user.getAvatar() : "");
vo.setProfile(Objects.nonNull(user) ? user.getProfile() : ""); vo.setProfile(Objects.nonNull(user) ? user.getProfile() : "");
......
ch-wx-api/src/main/java/com/wwdz/ch/wx/impl/ItemServiceImpl.java
View file @ 0dcee256
...@@ -70,6 +70,8 @@ public class ItemServiceImpl implements ItemService { ...@@ -70,6 +70,8 @@ public class ItemServiceImpl implements ItemService {
@Autowired @Autowired
private UserDao userDao; private UserDao userDao;
@Autowired @Autowired
private ItemsOfficialUsersRelationDao itemsOfficialUsersRelationDao;
@Autowired
private ItemEsDao itemEsDao; private ItemEsDao itemEsDao;
@Autowired @Autowired
...@@ -90,6 +92,8 @@ public class ItemServiceImpl implements ItemService { ...@@ -90,6 +92,8 @@ public class ItemServiceImpl implements ItemService {
@Autowired @Autowired
private FollowFansRecordService followFansRecordService; private FollowFansRecordService followFansRecordService;
private static final List<Long> officialUserIds = new ArrayList<>(Arrays.asList(1L));
@Override @Override
public Result nameList(ItemRequestDto dto) { public Result nameList(ItemRequestDto dto) {
try { try {
...@@ -202,66 +206,115 @@ public class ItemServiceImpl implements ItemService { ...@@ -202,66 +206,115 @@ public class ItemServiceImpl implements ItemService {
result.setList(new ArrayList<>()); result.setList(new ArrayList<>());
result.setHasNextPage(false); result.setHasNextPage(false);
// 查询用户和藏品关联表
List<UserItemsRelation> userItemsRelations = userItemsRelationDao.listByUserIds(dto.getUserId(), null);
if (CollectionUtils.isEmpty(userItemsRelations)) {
return Result.success(result);
}
List<Long> itemIds = userItemsRelations.stream()
.map(UserItemsRelation::getItemId).collect(Collectors.toList());
CoinRequestDto coinRequestDto = new CoinRequestDto();
coinRequestDto.setPage(dto.getPage());
coinRequestDto.setLimit(dto.getSize());
coinRequestDto.setIds(itemIds);
coinRequestDto.setIsGuest(!dto.getUserId().equals(userId));
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());
List<AgentTranceResponseVo> resultList = new ArrayList<>();
// 获取用户的昵称和头像 // 获取用户的昵称和头像
String nickname = ""; String nickname = "";
String avatar = ""; String avatar = "";
User user = userDao.queryById(dto.getId()); User user = userDao.queryById(dto.getUserId());
if (Objects.nonNull(user)) { if (Objects.nonNull(user)) {
nickname = user.getNickname(); nickname = user.getNickname();
avatar = user.getAvatar(); avatar = user.getAvatar();
} }
for (Item item : pageInfo.getList()) { if (!officialUserIds.contains(dto.getUserId())) {
ItemResponseVo vo = new ItemResponseVo(); // 查询用户和藏品关联表
// 设置基本信息 List<UserItemsRelation> userItemsRelations = userItemsRelationDao.listByUserIds(dto.getUserId(), null);
vo.setId(item.getId()); if (CollectionUtils.isEmpty(userItemsRelations)) {
vo.setName(item.getName()); return Result.success(result);
vo.setDetail(item.getDetail()); }
vo.setSourceType(item.getSourceType()); List<Long> itemIds = userItemsRelations.stream()
// 设置价格 .map(UserItemsRelation::getItemId).collect(Collectors.toList());
vo.setPrice(getPrice(item.getPrice())); CoinRequestDto coinRequestDto = new CoinRequestDto();
// 设置图片或视频 coinRequestDto.setPage(dto.getPage());
vo.setHomePageImage(MediaUtil.getHomePageImage(item.getImages(), item.getVideos())); coinRequestDto.setLimit(dto.getSize());
// 设置是否收藏和是否是自己发布的 coinRequestDto.setIds(itemIds);
vo.setIsCollected(0); coinRequestDto.setIsGuest(!dto.getUserId().equals(userId));
vo.setIsMine(1); coinRequestDto.setViewPermission(dto.getViewPermission());
vo.setIsCollected(favoritesItemsRelationDao.isCollected(dto.getUserId(), item.getId(), null) ? 1 : 0); // 分页查询
// 设置收藏数 PageInfo<Item> pageInfo = itemDao.findPageNotDeleted(coinRequestDto);
long count = favoritesItemsRelationDao.countByItemId(item.getId()); if (CollectionUtils.isEmpty(pageInfo.getList())) {
vo.setCollectCount(StringUtil.formatCount(count)); return Result.success(result);
// 设置用户头像和昵称 }
vo.setItemNickname(nickname); result.setTotal(pageInfo.getTotal());
vo.setItemAvatar(avatar); result.setHasNextPage(pageInfo.isHasNextPage());
vo.setViewPermission(item.getViewPermission());
List<AgentTranceResponseVo> resultList = new ArrayList<>();
AgentTranceResponseVo agentTranceResponseVo = new AgentTranceResponseVo(); for (Item item : pageInfo.getList()) {
agentTranceResponseVo.setAgentTraceInfo_(""); ItemResponseVo vo = new ItemResponseVo();
agentTranceResponseVo.setViewType(1); // 设置基本信息
agentTranceResponseVo.setDetail(vo); vo.setId(item.getId());
resultList.add(agentTranceResponseVo); 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(1);
vo.setIsCollected(favoritesItemsRelationDao.isCollected(dto.getUserId(), 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());
AgentTranceResponseVo agentTranceResponseVo = new AgentTranceResponseVo();
agentTranceResponseVo.setAgentTraceInfo_("");
agentTranceResponseVo.setViewType(1);
agentTranceResponseVo.setDetail(vo);
resultList.add(agentTranceResponseVo);
}
result.setList(resultList);
} else {
ItemsOfficialUsersRelation itemsOfficialUsersRelation = itemsOfficialUsersRelationDao.findItems(dto.getUserId());
if (Objects.nonNull(itemsOfficialUsersRelation)) {
EsSearchRequestDto esSearchRequestDto = new EsSearchRequestDto();
esSearchRequestDto.setIdStart(itemsOfficialUsersRelation.getBeginItemId());
esSearchRequestDto.setIdEnd(itemsOfficialUsersRelation.getEndItemId());
EsPageInfo esPageInfo = itemEsDao.findByRange(esSearchRequestDto);
if (Objects.isNull(esPageInfo) || CollectionUtils.isEmpty(esPageInfo.getDataList())) {
return Result.success(result);
}
result.setTotal(esPageInfo.getTotal());
result.setHasNextPage(true);
List<AgentTranceResponseVo> resultList = new ArrayList<>();
final String itemNickname = nickname;
final String itemAvatar = avatar;
esPageInfo.getDataList().forEach(s -> {
ItemResponseVo vo = new ItemResponseVo();
ItemOfEs es = (ItemOfEs) s;
// 设置基本信息
vo.setId(es.getId());
vo.setName(es.getName());
vo.setDetail(es.getDetail());
vo.setSourceType(es.getSourceType());
// 设置价格
vo.setPrice(getPrice(es.getPrice()));
// 设置图片或视频
vo.setHomePageImage(MediaUtil.getHomePageImage(es.getImages(), es.getVideos()));
// 设置是否收藏和是否是自己发布的
vo.setIsMine(1);
vo.setIsCollected(favoritesItemsRelationDao.isCollected(dto.getUserId(), es.getId(), null) ? 1 : 0);
// 设置收藏数
long count = favoritesItemsRelationDao.countByItemId(es.getId());
vo.setCollectCount(StringUtil.formatCount(count));
// 设置藏品发布用户的昵称和头像
vo.setItemNickname(itemNickname);
vo.setItemAvatar(itemAvatar);
vo.setViewPermission(es.getViewPermission());
AgentTranceResponseVo agentTranceResponseVo = new AgentTranceResponseVo();
agentTranceResponseVo.setAgentTraceInfo_("");
agentTranceResponseVo.setViewType(1);
agentTranceResponseVo.setDetail(vo);
resultList.add(agentTranceResponseVo);
});
result.setList(resultList);
}
} }
result.setList(resultList);
logger.info("【请求结束】查询我发布的成功"); logger.info("【请求结束】查询我发布的成功");
return Result.success(result); return Result.success(result);
} catch (Exception e) { } catch (Exception e) {
......
ch-wx-api/src/main/java/com/wwdz/ch/wx/impl/UserServiceImpl.java
View file @ 0dcee256
...@@ -195,6 +195,7 @@ public class UserServiceImpl implements UserService { ...@@ -195,6 +195,7 @@ public class UserServiceImpl implements UserService {
return Result.failed("获取用户手机号失败"); return Result.failed("获取用户手机号失败");
} }
// 获取登录结果 // 获取登录结果
dto.setMobile(mobile);
Map<String, Object> result = getLoginResult(dto, request); Map<String, Object> result = getLoginResult(dto, request);
Switch switchh = switchService.findOnly(); Switch switchh = switchService.findOnly();
boolean isOpen = Objects.nonNull(switchh) && switchh.getState() == 1; boolean isOpen = Objects.nonNull(switchh) && switchh.getState() == 1;
......
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