From 071675033dbbb68a48cc0d9001675df8ce3b8231 Mon Sep 17 00:00:00 2001
From: Helius <wangdoubleone@gmail.com>
Date: Thu, 23 Jul 2020 16:38:54 +0800
Subject: [PATCH] Merge branch 'master' of https://gitee.com/chonggaoxiao/new_excoin

---
 src/main/resources/mapper/member/MemberAccountMoneyChangeDao.xml |   17 +++++++++++++----
 1 files changed, 13 insertions(+), 4 deletions(-)

diff --git a/src/main/resources/mapper/member/MemberAccountMoneyChangeDao.xml b/src/main/resources/mapper/member/MemberAccountMoneyChangeDao.xml
index a787811..1c47b40 100644
--- a/src/main/resources/mapper/member/MemberAccountMoneyChangeDao.xml
+++ b/src/main/resources/mapper/member/MemberAccountMoneyChangeDao.xml
@@ -14,10 +14,6 @@
 		select * from member_account_money_change where type = 3 and member_id = #{memberId}  order by id desc
 	</select>
 	
-	<select id="selectWalletAgentIntoRecordsByMemIdTypeSymbol" resultType="com.xcong.excoin.modules.coin.entity.MemberAccountMoneyChange">
-		select * from member_account_money_change where type = 3 and content like '%佣金到账%' and member_id = #{memberId}  order by id desc
-	</select>
-	
 	<select id="selectWalletCoinRecordsInPage" resultType="com.xcong.excoin.modules.coin.entity.MemberAccountMoneyChange">
 		select * from member_account_money_change
 		<if test="record != null">
@@ -54,5 +50,18 @@
         </if>
         order by id desc
     </select>
+    
+	<select id="selectWalletAgentIntoRecordsByMemIdTypeSymbol" resultType="com.xcong.excoin.modules.coin.entity.MemberAccountMoneyChange">
+		select * from member_account_money_change <if test="record != null">
+            <where>
+            	type = 3
+            	and content like '%佣金到账%'
+                <if test="record.memberId != null" >
+                    and member_id=#{record.memberId}
+                </if>
+            </where>
+        </if>
+        order by id desc
+    </select>
 
 </mapper>
\ No newline at end of file

--
Gitblit v1.9.1