From 0ca7bf5c850eaef852a6b49d4b94e8366deedb29 Mon Sep 17 00:00:00 2001
From: xiaoyong931011 <15274802129@163.com>
Date: Wed, 26 May 2021 15:03:51 +0800
Subject: [PATCH] 20210525 申诉
---
src/main/resources/mapper/otc/OtcEntrustOrderDao.xml | 25 ++++++++++++++++++-------
1 files changed, 18 insertions(+), 7 deletions(-)
diff --git a/src/main/resources/mapper/otc/OtcEntrustOrderDao.xml b/src/main/resources/mapper/otc/OtcEntrustOrderDao.xml
index fcfc65c..092789a 100644
--- a/src/main/resources/mapper/otc/OtcEntrustOrderDao.xml
+++ b/src/main/resources/mapper/otc/OtcEntrustOrderDao.xml
@@ -13,33 +13,43 @@
,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
+ 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>
+ 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
</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>
@@ -57,9 +67,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