From ba00b9ce351642f3f70bc7ff24646c921bfb47cb Mon Sep 17 00:00:00 2001
From: xiaoyong931011 <15274802129@163.com>
Date: Fri, 28 May 2021 14:58:30 +0800
Subject: [PATCH] Merge branch 'otc' of http://120.27.238.55:7000/r/exchange into otc

---
 src/main/resources/mapper/otc/OtcOrderDao.xml |   39 ++++++++++++++++++++++++++++++++++++++-
 1 files changed, 38 insertions(+), 1 deletions(-)

diff --git a/src/main/resources/mapper/otc/OtcOrderDao.xml b/src/main/resources/mapper/otc/OtcOrderDao.xml
index 858e4a9..f932ed5 100644
--- a/src/main/resources/mapper/otc/OtcOrderDao.xml
+++ b/src/main/resources/mapper/otc/OtcOrderDao.xml
@@ -91,7 +91,7 @@
         where member_id=#{memberId}
         <!-- 查询除完成以外所有订单 -->
         <if test="status != null">
-            and status == #{status}
+            and status = #{status}
         </if>
     </select>
 
@@ -99,4 +99,41 @@
         select sum(total_amount) from otc_order
         where member_id=#{memberId} and status = 3
     </select>
+
+    <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,
+            status status,
+            order_type orderType
+        from otc_order
+        where ((member_id=#{memberId} and opposite_member_id=#{targetId})
+            or
+              (member_id=#{targetId} and opposite_member_id=#{memberId}))
+            and status in (1,2)
+        order by create_time desc
+
+    </select>
+
+    <select id="selectOneByMemberIdAndTargetId" resultType="com.xcong.excoin.modules.otc.vo.ChatOrderVo">
+        select
+            order_no orderNo,
+            member_id memberId,
+            unit_price unitPrice,
+            coin_amount usdtAmount,
+            total_amount totalAmount,
+            status status,
+            order_type orderType
+        from otc_order
+        where ((member_id=#{memberId} and opposite_member_id=#{targetId})
+            or
+               (member_id=#{targetId} and opposite_member_id=#{memberId}))
+        order by create_time desc
+            LIMIT 2
+
+    </select>
+
 </mapper>
\ No newline at end of file

--
Gitblit v1.9.1