From b99e4e26ce2750eafdb8e10c7c9e243328fc12c2 Mon Sep 17 00:00:00 2001
From: xiaoyong931011 <15274802129@163.com>
Date: Wed, 26 May 2021 19:19:08 +0800
Subject: [PATCH] 20210526 聊天
---
src/main/java/com/xcong/excoin/modules/otc/service/impl/OtcMsgServiceImpl.java | 30 ++++++++++++++++++++++++++++--
1 files changed, 28 insertions(+), 2 deletions(-)
diff --git a/src/main/java/com/xcong/excoin/modules/otc/service/impl/OtcMsgServiceImpl.java b/src/main/java/com/xcong/excoin/modules/otc/service/impl/OtcMsgServiceImpl.java
index 3b8212a..61e92c7 100644
--- a/src/main/java/com/xcong/excoin/modules/otc/service/impl/OtcMsgServiceImpl.java
+++ b/src/main/java/com/xcong/excoin/modules/otc/service/impl/OtcMsgServiceImpl.java
@@ -45,18 +45,33 @@
public IPage<MsgListVo> getMsgList(MsgListDto msgListDto) {
MemberEntity member = LoginUserUtils.getAppLoginUser();
Long memberId = member.getId();
-// Long memberId = 444L;
+// Long memberId = 445L;
Page<MsgListVo> page = new Page<>(msgListDto.getPageNum(), msgListDto.getPageSize());
OtcMsgUserListEntity otcMsgUserListEntity = new OtcMsgUserListEntity();
otcMsgUserListEntity.setMemberId(memberId);
- return otcMsgUserListDao.getMsgList(otcMsgUserListEntity, page);
+ IPage<MsgListVo> msgList = otcMsgUserListDao.getMsgList(otcMsgUserListEntity, page);
+ List<MsgListVo> records = msgList.getRecords();
+ if(CollUtil.isNotEmpty(records)){
+ for(MsgListVo msgListVo : records){
+ long targetId = msgListVo.getTargetId();
+ if(memberId == targetId){
+ MemberEntity memberEntity = memberDao.selectById(msgListVo.getMemberId());
+ msgListVo.setNickname(memberEntity.getName());
+ }else{
+ MemberEntity memberEntity = memberDao.selectById(targetId);
+ msgListVo.setNickname(memberEntity.getName());
+ }
+ }
+ }
+ return msgList;
}
@Override
@Transactional
public Result getChatBox(ChatBoxDto chatBoxDto) {
MemberEntity member = LoginUserUtils.getAppLoginUser();
+// MemberEntity member = memberDao.selectById(443L);
//对话是否存在
long id = chatBoxDto.getId();
if(ObjectUtil.isEmpty(id)){
@@ -77,6 +92,17 @@
otcMsgHistoryEntity.setMemberId(memberId);
otcMsgHistoryEntity.setTargetId(targetId);
IPage<ChatBoxVo> chatBoxVos= otcMsgHistoryDao.getChatBoxMsgList(page,otcMsgHistoryEntity);
+ List<ChatBoxVo> records = chatBoxVos.getRecords();
+ if(CollUtil.isNotEmpty(records)){
+ for(ChatBoxVo chatBoxVo : records){
+ long memberIds = chatBoxVo.getMemberId();
+ if(memberIds == member.getId()){
+ chatBoxVo.setIsSelf(1);
+ }else{
+ chatBoxVo.setIsSelf(2);
+ }
+ }
+ }
return Result.ok(chatBoxVos);
}
--
Gitblit v1.9.1