From afdbaa02913adb95cb9701d1a0a3a3a65c48b13a Mon Sep 17 00:00:00 2001 From: xiaoyong931011 <15274802129@163.com> Date: Wed, 26 May 2021 20:28:49 +0800 Subject: [PATCH] 20210526 聊天 --- src/main/java/com/xcong/excoin/modules/otc/service/impl/OtcMsgServiceImpl.java | 32 ++++++++++++++++++++++++++++---- 1 files changed, 28 insertions(+), 4 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 ed01fec..ef8c087 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 @@ -15,20 +15,20 @@ import com.xcong.excoin.modules.member.entity.MemberSettingEntity; import com.xcong.excoin.modules.otc.dao.OtcMsgHistoryDao; import com.xcong.excoin.modules.otc.dao.OtcMsgUserListDao; -import com.xcong.excoin.modules.otc.dto.ChatBoxDto; -import com.xcong.excoin.modules.otc.dto.ConnectDto; -import com.xcong.excoin.modules.otc.dto.MsgListDto; -import com.xcong.excoin.modules.otc.dto.SendMsgDto; +import com.xcong.excoin.modules.otc.dao.OtcOrderDao; +import com.xcong.excoin.modules.otc.dto.*; import com.xcong.excoin.modules.otc.entity.OtcMsgHistoryEntity; import com.xcong.excoin.modules.otc.entity.OtcMsgUserListEntity; import com.xcong.excoin.modules.otc.service.OtcMsgService; import com.xcong.excoin.modules.otc.vo.ChatBoxVo; +import com.xcong.excoin.modules.otc.vo.ChatOrderVo; import com.xcong.excoin.modules.otc.vo.MsgListVo; import lombok.RequiredArgsConstructor; import org.springframework.stereotype.Service; import org.springframework.transaction.annotation.Transactional; import javax.annotation.Resource; +import java.util.ArrayList; import java.util.List; @Service @@ -37,6 +37,7 @@ private final OtcMsgUserListDao otcMsgUserListDao; private final OtcMsgHistoryDao otcMsgHistoryDao; + private final OtcOrderDao otcOrderDao; private final MemberSettingDao memberSettingDao; private final MemberDao memberDao; @@ -205,5 +206,28 @@ return Result.ok(chatBoxVos); } + @Override + public Result getChatOrder(ChatOrderDto chatOrderDto) { + + MemberEntity member = LoginUserUtils.getAppLoginUser(); + Long memberId = member.getId(); +// Long memberId = 443L; + + long targetId = chatOrderDto.getTargetId(); + if(ObjectUtil.isEmpty(targetId)){ + return Result.fail("请返回重试"); + } + ArrayList<ChatOrderVo> chatOrderVoList = new ArrayList<>(); + List<ChatOrderVo> chatOrderVos = otcOrderDao.selectByMemberIdAndTargetId(memberId,targetId); + if(CollUtil.isNotEmpty(chatOrderVos)){ + for(ChatOrderVo chatOrderVo : chatOrderVos){ + if(memberId == chatOrderVo.getMemberId()){ + chatOrderVoList.add(chatOrderVo); + } + } + } + return Result.ok(chatOrderVoList); + } + } -- Gitblit v1.9.1