From e577147005f0e78e7be9333766032405107b6a26 Mon Sep 17 00:00:00 2001
From: Helius <wangdoubleone@gmail.com>
Date: Fri, 28 May 2021 10:53:45 +0800
Subject: [PATCH] Merge branch 'otc' of http://120.27.238.55:7000/r/exchange into otc
---
src/main/java/com/xcong/excoin/modules/otc/service/impl/OtcMsgServiceImpl.java | 5 +++--
1 files changed, 3 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 69fce34..d344999 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
@@ -53,6 +53,7 @@
OtcMsgUserListEntity otcMsgUserListEntity = new OtcMsgUserListEntity();
otcMsgUserListEntity.setMemberId(memberId);
+ otcMsgUserListEntity.setNickname(msgListDto.getNickname());
IPage<MsgListVo> msgList = otcMsgUserListDao.getMsgList(otcMsgUserListEntity, page);
List<MsgListVo> records = msgList.getRecords();
//更新最外层的消息提醒
@@ -60,8 +61,8 @@
if(CollUtil.isNotEmpty(records)){
for(MsgListVo msgListVo : records){
long targetId = msgListVo.getTargetId();
- MemberEntity memberEntity = memberDao.selectById(targetId);
- msgListVo.setNickname(memberEntity.getName());
+// MemberEntity memberEntity = memberDao.selectById(targetId);
+// msgListVo.setNickname(memberEntity.getName());
ChatOrderVo chatOrderVo = new ChatOrderVo();
List<ChatOrderVo> chatOrderVos = otcOrderDao.selectOneByMemberIdAndTargetId(memberId,targetId);
--
Gitblit v1.9.1