From 30c1c9d16a57d2bbc7cd1511d02c5ddcc6a143f6 Mon Sep 17 00:00:00 2001
From: Helius <wangdoubleone@gmail.com>
Date: Tue, 08 Jun 2021 16:10:44 +0800
Subject: [PATCH] modify

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

diff --git a/src/main/resources/mapper/otc/OtcEntrustOrderDao.xml b/src/main/resources/mapper/otc/OtcEntrustOrderDao.xml
index 58828f6..d61cbb2 100644
--- a/src/main/resources/mapper/otc/OtcEntrustOrderDao.xml
+++ b/src/main/resources/mapper/otc/OtcEntrustOrderDao.xml
@@ -11,8 +11,10 @@
             ,a.remain_coin_amount amount
             ,a.limit_min_amount min
             ,a.limit_max_amount max
-            ,b.total_order_cnt orderCnt
-            ,b.finish_ratio finishRatio
+            ,case when a.order_type = 'B' then b.buy_order_cnt
+                  when a.order_type = 'S' then b.sale_order_cnt end orderCnt
+            ,case when a.order_type = 'B' then b.finish_ratio
+                  when a.order_type = 'S' then b.sale_finish_ratio end finishRatio
             ,d.payment_type payType
         from otc_entrust_order a
         left join otc_market_bussiness b on a.member_id=b.member_id
@@ -29,9 +31,9 @@
                     and order_type = #{record.type}
                 </if>
             </if>
-            and and a.member_id not in (select black_member_id from otc_black_list x where x.member_id=#{memberId})
+            and a.member_id not in (select black_member_id from otc_black_list x where x.member_id=#{record.memberId})
         </where>
-        order by a.create_time desc
+        order by a.unit_price desc
     </select>
 
     <select id="selectEntrustOrderByOrderType" resultType="com.xcong.excoin.modules.otc.entity.OtcEntrustOrder">
@@ -51,6 +53,10 @@
             <if test="record.status != null and record.status != 3">
                 and a.status = #{record.status}
             </if>
+
+            <if test="record.isDefualt != null">
+                and b.is_defualt = #{record.isDefualt}
+            </if>
         </where>
     </select>
 

--
Gitblit v1.9.1