From 30c1c9d16a57d2bbc7cd1511d02c5ddcc6a143f6 Mon Sep 17 00:00:00 2001
From: Helius <wangdoubleone@gmail.com>
Date: Tue, 08 Jun 2021 16:10:44 +0800
Subject: [PATCH] modify

---
 src/main/java/com/xcong/excoin/rabbit/consumer/ChatConsumer.java |   13 ++++++++-----
 1 files changed, 8 insertions(+), 5 deletions(-)

diff --git a/src/main/java/com/xcong/excoin/rabbit/consumer/ChatConsumer.java b/src/main/java/com/xcong/excoin/rabbit/consumer/ChatConsumer.java
index 2305fb6..770af5c 100644
--- a/src/main/java/com/xcong/excoin/rabbit/consumer/ChatConsumer.java
+++ b/src/main/java/com/xcong/excoin/rabbit/consumer/ChatConsumer.java
@@ -24,7 +24,7 @@
 
 @Slf4j
 @Component
-//@ConditionalOnProperty(prefix = "app", name = "rabbit-consumer", havingValue = "true")
+@ConditionalOnProperty(prefix = "app", name = "websocket-job", havingValue = "true")
 public class ChatConsumer {
 
     @Autowired
@@ -52,11 +52,14 @@
         OtcMsgUserListEntity fromList = otcMsgUserListDao.selectChatListByToAndFrom(toId, fromId);
         if (fromList == null) {
             OtcMsgUserListEntity from = new OtcMsgUserListEntity();
-            from.setMemberId(toId);
-            from.setTargetId(fromId);
-            from.setIsRead(OtcMsgUserListEntity.ISREAD_ONE);
+            from.setMemberId(fromId);
+            from.setTargetId(toId);
+            from.setIsRead(OtcMsgUserListEntity.ISREAD_TWO);
             from.setLastMsgTime(new Date());
             otcMsgUserListDao.insert(from);
+        } else {
+            fromList.setLastMsgTime(new Date());
+            otcMsgUserListDao.updateById(fromList);
         }
 
         // 收件人是否存在聊天框
@@ -65,7 +68,7 @@
             OtcMsgUserListEntity from = new OtcMsgUserListEntity();
             from.setMemberId(toId);
             from.setTargetId(fromId);
-            from.setIsRead(OtcMsgUserListEntity.ISREAD_TWO);
+            from.setIsRead(OtcMsgUserListEntity.ISREAD_ONE);
             from.setLastMsgTime(new Date());
             otcMsgUserListDao.insert(from);
         } else {

--
Gitblit v1.9.1