From 543b7c41fb6d373af23e897e3f815422cc0ccdb1 Mon Sep 17 00:00:00 2001 From: djc <1002637814@qq.com> Date: Sat, 14 Oct 2023 17:14:11 +0800 Subject: [PATCH 1/2] fix: Room.isRoomFriend --- .../java/com/abin/mallchat/common/chat/domain/entity/Room.java | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/mallchat-chat-server/src/main/java/com/abin/mallchat/common/chat/domain/entity/Room.java b/mallchat-chat-server/src/main/java/com/abin/mallchat/common/chat/domain/entity/Room.java index cbcfe88..029bf14 100644 --- a/mallchat-chat-server/src/main/java/com/abin/mallchat/common/chat/domain/entity/Room.java +++ b/mallchat-chat-server/src/main/java/com/abin/mallchat/common/chat/domain/entity/Room.java @@ -92,6 +92,6 @@ public class Room implements Serializable { @JsonIgnore public boolean isRoomGroup() { - return RoomTypeEnum.of(this.hotFlag) == RoomTypeEnum.GROUP; + return RoomTypeEnum.of(this.type) == RoomTypeEnum.GROUP; } } From b8d3cb6d9181dddf02bd3b4b963f453e6505a8d8 Mon Sep 17 00:00:00 2001 From: djc <1002637814@qq.com> Date: Sun, 15 Oct 2023 11:51:43 +0800 Subject: [PATCH 2/2] fix: Room.isRoomFriend --- .../com/abin/mallchat/common/chat/dao/MessageMarkDao.java | 6 +++--- 1 file changed, 3 insertions(+), 3 deletions(-) diff --git a/mallchat-chat-server/src/main/java/com/abin/mallchat/common/chat/dao/MessageMarkDao.java b/mallchat-chat-server/src/main/java/com/abin/mallchat/common/chat/dao/MessageMarkDao.java index 5361ef0..bb7d4f4 100644 --- a/mallchat-chat-server/src/main/java/com/abin/mallchat/common/chat/dao/MessageMarkDao.java +++ b/mallchat-chat-server/src/main/java/com/abin/mallchat/common/chat/dao/MessageMarkDao.java @@ -2,7 +2,7 @@ package com.abin.mallchat.common.chat.dao; import com.abin.mallchat.common.chat.domain.entity.MessageMark; import com.abin.mallchat.common.chat.mapper.MessageMarkMapper; -import com.abin.mallchat.common.common.domain.enums.YesOrNoEnum; +import com.abin.mallchat.common.common.domain.enums.NormalOrNoEnum; import com.baomidou.mybatisplus.extension.service.impl.ServiceImpl; import org.springframework.stereotype.Service; @@ -29,14 +29,14 @@ public class MessageMarkDao extends ServiceImpl public Integer getMarkCount(Long msgId, Integer markType) { return lambdaQuery().eq(MessageMark::getMsgId, msgId) .eq(MessageMark::getType, markType) - .eq(MessageMark::getStatus, YesOrNoEnum.NO.getStatus()) + .eq(MessageMark::getStatus, NormalOrNoEnum.NORMAL.getStatus()) .count(); } public List getValidMarkByMsgIdBatch(List msgIds) { return lambdaQuery() .in(MessageMark::getMsgId, msgIds) - .eq(MessageMark::getStatus, YesOrNoEnum.NO.getStatus()) + .eq(MessageMark::getStatus, NormalOrNoEnum.NORMAL.getStatus()) .list(); } }