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

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

@@ -27,6 +27,7 @@ public class ItemResponseVo implements Entity {
     private Boolean isDeleted;
     private String itemAvatar;
     private String itemNickname;
+    private Long itemUserId;
     private String profile;
     private Integer timeType;
     private List<Map<String, Object>> imagesList;

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

@@ -56,6 +56,7 @@ public class ItemCommonServiceImpl implements ItemCommonService {
                 user = userDao.queryById(itemsOfficialUsersRelation.getUserId());
             }
         }
+        vo.setItemUserId(Objects.nonNull(user) ? user.getId() : null);
         vo.setItemNickname(Objects.nonNull(user) ? user.getNickname() : "");
         vo.setItemAvatar(Objects.nonNull(user) ? user.getAvatar() : "");
         vo.setProfile(Objects.nonNull(user) ? user.getProfile() : "");

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

@@ -70,6 +70,8 @@ public class ItemServiceImpl implements ItemService {
     @Autowired
     private UserDao userDao;
     @Autowired
+    private ItemsOfficialUsersRelationDao itemsOfficialUsersRelationDao;
+    @Autowired
     private ItemEsDao itemEsDao;
 
     @Autowired
@@ -90,6 +92,8 @@ public class ItemServiceImpl implements ItemService {
     @Autowired
     private FollowFansRecordService followFansRecordService;
 
+    private static final List<Long> officialUserIds = new ArrayList<>(Arrays.asList(1L));
+
     @Override
     public Result nameList(ItemRequestDto dto) {
         try {
@@ -202,6 +206,15 @@ public class ItemServiceImpl implements ItemService {
             result.setList(new ArrayList<>());
             result.setHasNextPage(false);
 
+            // 获取用户的昵称和头像
+            String nickname = "";
+            String avatar = "";
+            User user = userDao.queryById(dto.getUserId());
+            if (Objects.nonNull(user)) {
+                nickname = user.getNickname();
+                avatar = user.getAvatar();
+            }
+            if (!officialUserIds.contains(dto.getUserId())) {
                 // 查询用户和藏品关联表
                 List<UserItemsRelation> userItemsRelations = userItemsRelationDao.listByUserIds(dto.getUserId(), null);
                 if (CollectionUtils.isEmpty(userItemsRelations)) {
@@ -224,14 +237,6 @@ public class ItemServiceImpl implements ItemService {
                 result.setHasNextPage(pageInfo.isHasNextPage());
 
                 List<AgentTranceResponseVo> resultList = new ArrayList<>();
-            // 获取用户的昵称和头像
-            String nickname = "";
-            String avatar = "";
-            User user = userDao.queryById(dto.getId());
-            if (Objects.nonNull(user)) {
-                nickname = user.getNickname();
-                avatar = user.getAvatar();
-            }
                 for (Item item : pageInfo.getList()) {
                     ItemResponseVo vo = new ItemResponseVo();
                     // 设置基本信息
@@ -262,6 +267,54 @@ public class ItemServiceImpl implements ItemService {
                     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);
+                }
+            }
             logger.info("【请求结束】查询我发布的成功");
             return Result.success(result);
         } catch (Exception e) {

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

@@ -195,6 +195,7 @@ public class UserServiceImpl implements UserService {
                 return Result.failed("获取用户手机号失败");
             }
             // 获取登录结果
+            dto.setMobile(mobile);
             Map<String, Object> result = getLoginResult(dto, request);
             Switch switchh = switchService.findOnly();
             boolean isOpen = Objects.nonNull(switchh) && switchh.getState() == 1;