From c6f226f7f9f9aa46c27db28d6796cd15d101cfe9 Mon Sep 17 00:00:00 2001
From: Helius <wangdoubleone@gmail.com>
Date: Tue, 25 May 2021 15:37:38 +0800
Subject: [PATCH] modify

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

diff --git a/src/main/resources/mapper/otc/OtcEntrustOrderDao.xml b/src/main/resources/mapper/otc/OtcEntrustOrderDao.xml
index fcfc65c..e164ebb 100644
--- a/src/main/resources/mapper/otc/OtcEntrustOrderDao.xml
+++ b/src/main/resources/mapper/otc/OtcEntrustOrderDao.xml
@@ -13,17 +13,21 @@
             ,a.limit_max_amount max
             ,b.total_order_cnt orderCnt
             ,b.finish_ratio finishRatio
+            ,d.payment_type payType
         from otc_entrust_order a
         left join otc_market_bussiness b on a.member_id=b.member_id
         left join member c on a.member_id=c.id
+        left join member_payment_method d on a.member_id=d.member_id and d.is_defualt=1
+        inner join otc_black_list e on a.member_id!=e.black_member_id and e.member_id=#{record.memberId}
         <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">
@@ -39,7 +43,7 @@
                 and status != #{record.status}
             </if>
             <if test="record.status != null and record.status != 3">
-                and status == #{record.status}
+                and status = #{record.status}
             </if>
         </where>
     </select>
@@ -57,9 +61,10 @@
                 and status != #{record.status}
             </if>
             <if test="record.status != null and record.status != 3">
-                and status == #{record.status}
+                and status = #{record.status}
             </if>
         </where>
+        order by create_time desc
     </select>
 
     <update id="updateRemainAmount">

--
Gitblit v1.9.1