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

ch-dao/src/main/java/com/wwdz/ch/db/dao/ItemsOfficialUsersRelationDao.java

@@ -2,8 +2,12 @@ package com.wwdz.ch.db.dao;
 
 import com.wwdz.ch.db.domain.ItemsOfficialUsersRelation;
 
+import java.util.List;
+
 public interface ItemsOfficialUsersRelationDao {
     ItemsOfficialUsersRelation findUser(Long itemId);
 
     ItemsOfficialUsersRelation findItems(Long user);
+
+    List<ItemsOfficialUsersRelation> list();
 }

ch-dao/src/main/java/com/wwdz/ch/db/impl/ItemsOfficialUsersRelationDaoImpl.java

@@ -7,6 +7,8 @@ import com.wwdz.ch.db.mapper.ItemsOfficialUsersRelationMapper;
 import org.springframework.beans.factory.annotation.Autowired;
 import org.springframework.stereotype.Repository;
 
+import java.util.List;
+
 @Repository
 public class ItemsOfficialUsersRelationDaoImpl implements ItemsOfficialUsersRelationDao {
     @Autowired
@@ -28,4 +30,10 @@ public class ItemsOfficialUsersRelationDaoImpl implements ItemsOfficialUsersRela
         criteria.andUserIdEqualTo(userId);
         return itemsOfficialUsersRelationMapper.selectOneByExample(example);
     }
+
+    @Override
+    public List<ItemsOfficialUsersRelation> list() {
+        ItemsOfficialUsersRelationExample example = new ItemsOfficialUsersRelationExample();
+        return itemsOfficialUsersRelationMapper.selectByExample(example);
+    }
 }

ch-wx-api/src/main/java/com/wwdz/ch/wx/entity/request/MessageRequestDto.java

 package com.wwdz.ch.wx.entity.request;
 
+import com.wwdz.ch.db.dto.request.BaseRequestDto;
 import com.xxdxxs.entity.Entity;
 import lombok.Data;
 
@@ -7,7 +8,7 @@ import java.util.Date;
 import java.util.List;
 
 @Data
-public class MessageRequestDto implements Entity {
+public class MessageRequestDto extends BaseRequestDto implements Entity {
 
     private Integer messageRecordId;
 

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

@@ -261,10 +261,9 @@ public class FavoritesServiceImpl implements FavoritesService {
                 // 设置价格
                 vo.setPrice(getPrice(item.getPrice()));
                 // 设置是否收藏或是否是自己发布的
-                vo.setIsCollected(0);
+                vo.setIsCollected(favoritesItemsRelationDao.isCollected(userId, relation.getItemId(), null) ? 1 : 0);
                 vo.setIsMine(0);
                 if (Objects.nonNull(dto.getUserId()) && dto.getUserId() != 0L) {
-                    vo.setIsCollected(favoritesItemsRelationDao.isCollected(dto.getUserId(), relation.getItemId(), null) ? 1 : 0);
                     if (!isGuest) {
                         vo.setIsMine(userItemsRelationDao.isExisted(dto.getUserId(), item.getId()) ? 1 : 0);
                     }

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

@@ -99,8 +99,6 @@ 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 {
@@ -222,6 +220,14 @@ public class ItemServiceImpl implements ItemService {
             }
             // 是否客态
             boolean isGuest = !dto.getUserId().equals(userId);
+            // 获取官方用户id
+            List<ItemsOfficialUsersRelation> itemsOfficialUsersRelations = itemsOfficialUsersRelationDao.list();
+            List<Long> officialUserIds = new ArrayList<>();
+            if (CollectionUtils.isNotEmpty(itemsOfficialUsersRelations)) {
+                officialUserIds = itemsOfficialUsersRelations.stream()
+                        .map(ItemsOfficialUsersRelation::getUserId).collect(Collectors.toList());
+            }
+
             if (!officialUserIds.contains(dto.getUserId())) {
                 // 查询用户和藏品关联表
                 List<UserItemsRelation> userItemsRelations = userItemsRelationDao.listByUserIds(dto.getUserId(), null);
@@ -259,7 +265,7 @@ public class ItemServiceImpl implements ItemService {
                     // 设置是否收藏和是否是自己发布的
                     vo.setIsCollected(0);
                     vo.setIsMine(isGuest ? 0 : 1);
-                    vo.setIsCollected(favoritesItemsRelationDao.isCollected(dto.getUserId(), item.getId(), null) ? 1 : 0);
+                    vo.setIsCollected(favoritesItemsRelationDao.isCollected(userId, item.getId(), null) ? 1 : 0);
                     // 设置收藏数
                     long count = favoritesItemsRelationDao.countByItemId(item.getId());
                     vo.setCollectCount(StringUtil.formatCount(count));
@@ -307,7 +313,7 @@ public class ItemServiceImpl implements ItemService {
                         vo.setHomePageImage(MediaUtil.getHomePageImage(es.getImages(), es.getVideos()));
                         // 设置是否收藏和是否是自己发布的
                         vo.setIsMine(isGuest ? 0 : 1);
-                        vo.setIsCollected(favoritesItemsRelationDao.isCollected(dto.getUserId(), es.getId(), null) ? 1 : 0);
+                        vo.setIsCollected(favoritesItemsRelationDao.isCollected(userId, es.getId(), null) ? 1 : 0);
                         // 设置收藏数
                         long count = favoritesItemsRelationDao.countByItemId(es.getId());
                         vo.setCollectCount(StringUtil.formatCount(count));
@@ -381,11 +387,12 @@ public class ItemServiceImpl implements ItemService {
                 // 设置价格
                 itemResponseVo.setPrice(getPrice(item.getPrice()));
                 // 设置是否收藏或是否是自己发布的
-                itemResponseVo.setIsCollected(1);
+                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));
@@ -544,13 +551,13 @@ public class ItemServiceImpl implements ItemService {
             }
             // 设置价格
             itemResponseVo.setPrice(getPrice(item.getPrice()));
-            // 设置是否收藏或是否是自己发布的
-            itemResponseVo.setIsCollected(0);
-            itemResponseVo.setIsMine(0);
             // 设置藏品的发布用户昵称和头像
             itemCommonService.getNicknameAvatar(item.getId(), itemResponseVo);
             itemResponseVo.setIsFollowed(false);
             itemResponseVo.setFollowedId(null);
+            // 设置是否收藏或是否是自己发布的
+            itemResponseVo.setIsCollected(0);
+            itemResponseVo.setIsMine(0);
             if (Objects.nonNull(dto.getUserId()) && !dto.getUserId().equals(0L)) {
                 FavoritesItemsRelation favoritesItemsRelation = favoritesItemsRelationDao.selectByUserIdItemId(dto.getUserId(), item.getId());
                 if (Objects.nonNull(favoritesItemsRelation)) {

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

@@ -116,6 +116,8 @@ public class MessageServiceImpl implements MessageService {
             MessageRecordRequestDto messageRecordRequestDto = new MessageRecordRequestDto();
             messageRecordRequestDto.setReceiverId(messageRequestDto.getReceiverId());
             messageRecordRequestDto.setType(messageRequestDto.getType());
+            messageRecordRequestDto.setPage(messageRequestDto.getPage());
+            messageRecordRequestDto.setLimit(messageRequestDto.getLimit());
             List<MessageRecord> list = messageRecordDao.findList(messageRecordRequestDto);
             PageInfo<MessageRecord> pageInfo = new PageInfo<>(list);
             //消息id