From 2049e6d4ebdf711ded2593808e7b16abaaf6586c Mon Sep 17 00:00:00 2001
From: Helius <wangdoubleone@gmail.com>
Date: Tue, 25 May 2021 17:12:15 +0800
Subject: [PATCH] modify
---
src/main/resources/mapper/otc/OtcEntrustOrderDao.xml | 20 ++++++++++++++------
1 files changed, 14 insertions(+), 6 deletions(-)
diff --git a/src/main/resources/mapper/otc/OtcEntrustOrderDao.xml b/src/main/resources/mapper/otc/OtcEntrustOrderDao.xml
index 350ae27..ea0a2c6 100644
--- a/src/main/resources/mapper/otc/OtcEntrustOrderDao.xml
+++ b/src/main/resources/mapper/otc/OtcEntrustOrderDao.xml
@@ -13,9 +13,15 @@
,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
+ <if test="record.memberId != null">
+ and e.member_id=#{record.memberId}
+ </if>
<where>
a.status=1 and a.remain_coin_amount > 0
<if test="record != null">
@@ -28,19 +34,21 @@
</select>
<select id="selectEntrustOrderByOrderType" resultType="com.xcong.excoin.modules.otc.entity.OtcEntrustOrder">
- select * from otc_entrust_order
+ select a.*, b.payment_type payType
+ from otc_entrust_order a
+ left join member_payment_method b on a.member_id=b.member_id and b.is_defualt=1
<where>
<if test="record.orderType != null and record.orderType != ''" >
- and order_type = #{record.orderType}
+ and a.order_type = #{record.orderType}
</if>
<if test="record.memberId != null">
- and member_id = #{record.memberId}
+ and a.member_id = #{record.memberId}
</if>
<if test="record.status != null and record.status == 3">
- and status != #{record.status}
+ and a.status != #{record.status}
</if>
<if test="record.status != null and record.status != 3">
- and status == #{record.status}
+ and a.status = #{record.status}
</if>
</where>
</select>
@@ -58,7 +66,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