From e21fb7543c9199cfbaa7f44e99133eb747ad742c Mon Sep 17 00:00:00 2001
From: Helius <wangdoubleone@gmail.com>
Date: Tue, 25 May 2021 15:04:17 +0800
Subject: [PATCH] Merge branch 'otc' of http://120.27.238.55:7000/r/exchange into otc

---
 src/main/resources/mapper/otc/OtcEntrustOrderDao.xml |    6 ++++--
 1 files changed, 4 insertions(+), 2 deletions(-)

diff --git a/src/main/resources/mapper/otc/OtcEntrustOrderDao.xml b/src/main/resources/mapper/otc/OtcEntrustOrderDao.xml
index 350ae27..da41c89 100644
--- a/src/main/resources/mapper/otc/OtcEntrustOrderDao.xml
+++ b/src/main/resources/mapper/otc/OtcEntrustOrderDao.xml
@@ -13,9 +13,11 @@
             ,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
         <where>
             a.status=1 and a.remain_coin_amount > 0
             <if test="record != null">
@@ -40,7 +42,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>
@@ -58,7 +60,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>
         order by create_time desc

--
Gitblit v1.9.1