From 9a968ba186af5280fcc29cc3eb04412eff204ba7 Mon Sep 17 00:00:00 2001
From: Helius <wangdoubleone@gmail.com>
Date: Thu, 27 May 2021 16:37:33 +0800
Subject: [PATCH] modify

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

diff --git a/src/main/resources/mapper/otc/OtcOrderDao.xml b/src/main/resources/mapper/otc/OtcOrderDao.xml
index 154def2..20ac813 100644
--- a/src/main/resources/mapper/otc/OtcOrderDao.xml
+++ b/src/main/resources/mapper/otc/OtcOrderDao.xml
@@ -4,7 +4,7 @@
 
     <select id="selectOrderListUnFinish" resultType="com.xcong.excoin.modules.otc.entity.OtcOrder">
         select * from otc_order
-        where status not in (2,4) and member_id=#{memberId} and entrust_order_id=#{entrustOrderId}
+        where status in (1,2) and member_id=#{memberId} and entrust_order_id=#{entrustOrderId}
     </select>
 
 
@@ -81,8 +81,41 @@
 
     <select id="selectMemberAvgCoinTime" resultType="java.math.BigDecimal">
         select
-            IFNULL(sum(timestampdiff(SECOND, pay_time, coin_time))/count(1), 0)
+            IFNULL(sum(timestampdiff(SECOND, pay_time, finish_time))/count(1), 0)
         from otc_order
         where status=3 and member_id=40 and order_type='S'
     </select>
+
+    <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 = #{status}
+        </if>
+    </select>
+
+    <select id="selectOrderTotalAmount" resultType="java.math.BigDecimal">
+        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>
+
 </mapper>
\ No newline at end of file

--
Gitblit v1.9.1