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/resources/mapper/otc/OtcOrderDao.xml | 1 +
src/main/java/com/xcong/excoin/modules/otc/service/impl/OtcMsgServiceImpl.java | 11 ++++++++++-
src/main/java/com/xcong/excoin/modules/otc/vo/ChatOrderVo.java | 2 ++
3 files changed, 13 insertions(+), 1 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 3164006..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
@@ -28,6 +28,7 @@
import org.springframework.transaction.annotation.Transactional;
import javax.annotation.Resource;
+import java.util.ArrayList;
import java.util.List;
@Service
@@ -216,8 +217,16 @@
if(ObjectUtil.isEmpty(targetId)){
return Result.fail("请返回重试");
}
+ ArrayList<ChatOrderVo> chatOrderVoList = new ArrayList<>();
List<ChatOrderVo> chatOrderVos = otcOrderDao.selectByMemberIdAndTargetId(memberId,targetId);
- return Result.ok(chatOrderVos);
+ if(CollUtil.isNotEmpty(chatOrderVos)){
+ for(ChatOrderVo chatOrderVo : chatOrderVos){
+ if(memberId == chatOrderVo.getMemberId()){
+ chatOrderVoList.add(chatOrderVo);
+ }
+ }
+ }
+ return Result.ok(chatOrderVoList);
}
diff --git a/src/main/java/com/xcong/excoin/modules/otc/vo/ChatOrderVo.java b/src/main/java/com/xcong/excoin/modules/otc/vo/ChatOrderVo.java
index 88271f4..54acbb7 100644
--- a/src/main/java/com/xcong/excoin/modules/otc/vo/ChatOrderVo.java
+++ b/src/main/java/com/xcong/excoin/modules/otc/vo/ChatOrderVo.java
@@ -18,6 +18,8 @@
@ApiModelProperty(value = "订单编号")
private String orderNo;
+ private Long memberId;
+
/**
* 单价
*/
diff --git a/src/main/resources/mapper/otc/OtcOrderDao.xml b/src/main/resources/mapper/otc/OtcOrderDao.xml
index b45dcfa..20ac813 100644
--- a/src/main/resources/mapper/otc/OtcOrderDao.xml
+++ b/src/main/resources/mapper/otc/OtcOrderDao.xml
@@ -103,6 +103,7 @@
<select id="selectByMemberIdAndTargetId" resultType="com.xcong.excoin.modules.otc.vo.ChatOrderVo">
select
order_no orderNo,
+ member_id memberId,
unit_price unitPrice,
coin_amount usdtAmount,
total_amount totalAmount,
--
Gitblit v1.9.1