From 133d94a3a440f6abb317fd6d0a945abfa06e345f Mon Sep 17 00:00:00 2001
From: "xie.bx" <Blue_Xie@epam.com>
Date: Sun, 5 Nov 2023 23:43:11 +0800
Subject: [PATCH] =?UTF-8?q?=E4=BF=AE=E5=A4=8D=E6=B6=88=E6=81=AF=E4=B9=B1?=
 =?UTF-8?q?=E5=BA=8F=E7=9A=84bug?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

---
 .../service/impl/GroupMessageServiceImpl.java |  2 ++
 .../impl/PrivateMessageServiceImpl.java       | 19 ++++++++++---------
 2 files changed, 12 insertions(+), 9 deletions(-)

diff --git a/im-platform/src/main/java/com/bx/implatform/service/impl/GroupMessageServiceImpl.java b/im-platform/src/main/java/com/bx/implatform/service/impl/GroupMessageServiceImpl.java
index c4e6de4..f0fb54c 100644
--- a/im-platform/src/main/java/com/bx/implatform/service/impl/GroupMessageServiceImpl.java
+++ b/im-platform/src/main/java/com/bx/implatform/service/impl/GroupMessageServiceImpl.java
@@ -7,6 +7,7 @@ import com.baomidou.mybatisplus.core.toolkit.Wrappers;
 import com.baomidou.mybatisplus.extension.service.impl.ServiceImpl;
 import com.bx.imclient.IMClient;
 import com.bx.imcommon.contant.IMConstant;
+import com.bx.implatform.entity.PrivateMessage;
 import com.bx.implatform.util.DateTimeUtils;
 import com.bx.implatform.vo.GroupMessageVO;
 import com.bx.imcommon.model.IMGroupMessage;
@@ -204,6 +205,7 @@ public class GroupMessageServiceImpl extends ServiceImpl<GroupMessageMapper, Gro
                 .gt(GroupMessage::getSendTime, minDate)
                 .in(GroupMessage::getGroupId, ids)
                 .ne(GroupMessage::getStatus, MessageStatus.RECALL.code())
+                .orderByAsc(GroupMessage::getId)
                 .last("limit 100");
 
         List<GroupMessage> messages = this.list(wrapper);
diff --git a/im-platform/src/main/java/com/bx/implatform/service/impl/PrivateMessageServiceImpl.java b/im-platform/src/main/java/com/bx/implatform/service/impl/PrivateMessageServiceImpl.java
index c55ea56..e12cdc3 100644
--- a/im-platform/src/main/java/com/bx/implatform/service/impl/PrivateMessageServiceImpl.java
+++ b/im-platform/src/main/java/com/bx/implatform/service/impl/PrivateMessageServiceImpl.java
@@ -191,7 +191,7 @@ public class PrivateMessageServiceImpl extends ServiceImpl<PrivateMessageMapper,
     /**
      * 拉取消息，只能拉取最近3个月的消息，一次拉取100条
      *
-     * @param minId  消息起始id
+     * @param minId 消息起始id
      * @return 聊天消息列表
      */
     @Override
@@ -212,8 +212,9 @@ public class PrivateMessageServiceImpl extends ServiceImpl<PrivateMessageMapper,
                 .and(wrap -> wrap.and(
                         wp -> wp.eq(PrivateMessage::getSendId, session.getUserId())
                                 .in(PrivateMessage::getRecvId, friendIds))
-                                .or(wp -> wp.eq(PrivateMessage::getRecvId, session.getUserId())
-                                        .in(PrivateMessage::getSendId, friendIds)))
+                        .or(wp -> wp.eq(PrivateMessage::getRecvId, session.getUserId())
+                                .in(PrivateMessage::getSendId, friendIds)))
+                .orderByAsc(PrivateMessage::getId)
                 .last("limit 100");
 
         List<PrivateMessage> messages = this.list(queryWrapper);
@@ -236,7 +237,7 @@ public class PrivateMessageServiceImpl extends ServiceImpl<PrivateMessageMapper,
     /**
      * 消息已读,将整个会话的消息都置为已读状态
      *
-     * @param friendId  好友id
+     * @param friendId 好友id
      */
     @Transactional
     @Override
@@ -257,11 +258,11 @@ public class PrivateMessageServiceImpl extends ServiceImpl<PrivateMessageMapper,
         imClient.sendPrivateMessage(sendMessage);
         // 修改消息状态为已读
         LambdaUpdateWrapper<PrivateMessage> updateWrapper = Wrappers.lambdaUpdate();
-        updateWrapper.eq(PrivateMessage::getSendId,friendId)
-                .eq(PrivateMessage::getRecvId,session.getUserId())
-                .eq(PrivateMessage::getStatus,MessageStatus.SENDED.code())
-                .set(PrivateMessage::getStatus,MessageStatus.READED.code());
+        updateWrapper.eq(PrivateMessage::getSendId, friendId)
+                .eq(PrivateMessage::getRecvId, session.getUserId())
+                .eq(PrivateMessage::getStatus, MessageStatus.SENDED.code())
+                .set(PrivateMessage::getStatus, MessageStatus.READED.code());
         this.update(updateWrapper);
-        log.info("消息已读，接收方id:{},发送方id:{}", session.getUserId(),friendId);
+        log.info("消息已读，接收方id:{},发送方id:{}", session.getUserId(), friendId);
     }
 }