From 0730d0e9b5714394241cb3a19f3be38a40c46f7c Mon Sep 17 00:00:00 2001
From: zainali5120 <512061637@qq.com>
Date: Wed, 11 Nov 2020 16:40:32 +0800
Subject: [PATCH] Merge remote-tracking branch 'origin/roc-bak' into roc-bak
---
src/main/resources/mapper/modules/MemberCoinChargeMapper.xml | 22 +++++++++++++++++++++-
1 files changed, 21 insertions(+), 1 deletions(-)
diff --git a/src/main/resources/mapper/modules/MemberCoinChargeMapper.xml b/src/main/resources/mapper/modules/MemberCoinChargeMapper.xml
index 90df952..81999bc 100644
--- a/src/main/resources/mapper/modules/MemberCoinChargeMapper.xml
+++ b/src/main/resources/mapper/modules/MemberCoinChargeMapper.xml
@@ -3,7 +3,24 @@
<mapper namespace="com.xcong.excoin.modules.member.mapper.MemberCoinChargeMapper">
<select id="findMemberApplyCoinListInPage" resultType="com.xcong.excoin.modules.member.vo.MemberCoinChargeVo">
- select * from member_coin_charge s left join member m on m.id = s.member_id
+ SELECT
+ s.address,
+ s.amount,
+ s.create_time,
+ s.id,
+ s.order_code,
+ s.`status`,
+ s.member_id,
+ s.symbol,
+ s.tag,
+ m.phone,
+ m.email,
+ m.invite_id,
+ concat(auth.first_name,auth.second_name) as realName
+ FROM
+ member_coin_charge s
+ LEFT JOIN member m ON m.id = s.member_id
+ left join member_authentication auth on auth.member_id = s.member_id
<where>
<if test="record != null" >
<if test="record.account!=null and record.account!=''">
@@ -15,6 +32,9 @@
<if test="record.isTest!=null and record.isTest!=''">
and m.account_type= #{record.isTest}
</if>
+ <if test="record.symbol != null and record.symbol!=''">
+ and s.symbol = #{record.symbol}
+ </if>
</if>
</where>
order by s.create_time desc
--
Gitblit v1.9.1