From 7f133cb8fc080b64ab8002b35f04b646f95a6abf Mon Sep 17 00:00:00 2001
From: Helius <wangdoubleone@gmail.com>
Date: Thu, 27 May 2021 16:37:38 +0800
Subject: [PATCH] Merge branch 'otc' of http://120.27.238.55:7000/r/exchange into otc
---
src/main/resources/mapper/otc/OtcOrderDao.xml | 46 ++++++++++++++++++++++++++++++++++++++++------
1 files changed, 40 insertions(+), 6 deletions(-)
diff --git a/src/main/resources/mapper/otc/OtcOrderDao.xml b/src/main/resources/mapper/otc/OtcOrderDao.xml
index 7aafbd5..f932ed5 100644
--- a/src/main/resources/mapper/otc/OtcOrderDao.xml
+++ b/src/main/resources/mapper/otc/OtcOrderDao.xml
@@ -89,12 +89,9 @@
<select id="selectOrderListForUser" resultType="com.xcong.excoin.modules.otc.entity.OtcOrder">
select * from otc_order
where member_id=#{memberId}
- <!-- 查询除完成以外所有订单 -->
- <if test="status != null and status == 0">
- and status != 3
- </if>
- <if test="status != null and status != 0">
- and status != 3
+ <!-- 查询除完成以外所有订单 -->
+ <if test="status != null">
+ and status = #{status}
</if>
</select>
@@ -102,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