From d30d959c8f249c20b39e66dd0c48341a77751d21 Mon Sep 17 00:00:00 2001
From: Helius <wangdoubleone@gmail.com>
Date: Fri, 21 May 2021 17:03:32 +0800
Subject: [PATCH] modify

---
 src/main/resources/mapper/otc/OtcEntrustOrderDao.xml |   33 ++++++++++++++++++++++++++++++---
 1 files changed, 30 insertions(+), 3 deletions(-)

diff --git a/src/main/resources/mapper/otc/OtcEntrustOrderDao.xml b/src/main/resources/mapper/otc/OtcEntrustOrderDao.xml
index 6686dce..350ae27 100644
--- a/src/main/resources/mapper/otc/OtcEntrustOrderDao.xml
+++ b/src/main/resources/mapper/otc/OtcEntrustOrderDao.xml
@@ -6,7 +6,7 @@
         select
             a.id,
             b.id mbId
-            ,b.nikename nickname
+            ,c.name nickname
             ,a.unit_price unitPrice
             ,a.remain_coin_amount amount
             ,a.limit_min_amount min
@@ -14,15 +14,17 @@
             ,b.total_order_cnt orderCnt
             ,b.finish_ratio finishRatio
         from otc_entrust_order a
-        left join otc_market_bussiness b on a.mb_id=b.id
+        left join otc_market_bussiness b on a.member_id=b.member_id
+        left join member c on a.member_id=c.id
         <where>
-            a.status=1
+            a.status=1 and a.remain_coin_amount > 0
             <if test="record != null">
                 <if test="record.type != null and record.type!=''">
                     and order_type = #{record.type}
                 </if>
             </if>
         </where>
+        order by a.create_time desc
     </select>
 
     <select id="selectEntrustOrderByOrderType" resultType="com.xcong.excoin.modules.otc.entity.OtcEntrustOrder">
@@ -42,4 +44,29 @@
             </if>
         </where>
     </select>
+
+    <select id="selectOwnEntrustListInPage" resultType="com.xcong.excoin.modules.otc.entity.OtcEntrustOrder">
+        select * from otc_entrust_order
+        <where>
+            <if test="record.orderType != null and record.orderType != ''" >
+                and order_type = #{record.orderType}
+            </if>
+            <if test="record.memberId != null">
+                and member_id = #{record.memberId}
+            </if>
+            <if test="record.status != null and record.status == 3">
+                and status != #{record.status}
+            </if>
+            <if test="record.status != null and record.status != 3">
+                and status == #{record.status}
+            </if>
+        </where>
+        order by create_time desc
+    </select>
+
+    <update id="updateRemainAmount">
+        update otc_entrust_order
+        set remain_coin_amount = remain_coin_amount + ${amount}
+        where id=#{id}
+    </update>
 </mapper>
\ No newline at end of file

--
Gitblit v1.9.1