From f3948fa31158c7b7dea3b038e01c43ce54c55a1c Mon Sep 17 00:00:00 2001
From: Helius <wangdoubleone@gmail.com>
Date: Wed, 14 Apr 2021 11:09:57 +0800
Subject: [PATCH] modify

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

diff --git a/src/main/resources/mapper/member/MemberAccountMoneyChangeDao.xml b/src/main/resources/mapper/member/MemberAccountMoneyChangeDao.xml
index aeb75cc..d3c6b83 100644
--- a/src/main/resources/mapper/member/MemberAccountMoneyChangeDao.xml
+++ b/src/main/resources/mapper/member/MemberAccountMoneyChangeDao.xml
@@ -2,6 +2,14 @@
 <!DOCTYPE mapper PUBLIC "-//mybatis.org//DTD Mapper 3.0//EN" "http://mybatis.org/dtd/mybatis-3-mapper.dtd">
 <mapper namespace="com.xcong.excoin.modules.coin.dao.MemberAccountMoneyChangeDao">
 
+    <select id="coinInList" resultType="com.xcong.excoin.modules.coin.entity.MemberAccountMoneyChange">
+		select * from member_account_money_change
+            	where member_id = #{record.memberId}
+            	and (content like '%转%' or content like '%收款%' or (content like '%提币%' and withdraw_id in 
+            	(select id from member_coin_withdraw w where w.member_id = #{record.memberId} and is_inside = "Y")) )
+        order by create_time desc
+    </select>
+	
     <select id="selectWalletCoinRecordsByMemIdTypeSymbol" resultType="com.xcong.excoin.modules.coin.entity.MemberAccountMoneyChange">
 		select * from member_account_money_change where type = 1 and member_id = #{memberId} order by id desc
 	</select>
@@ -12,10 +20,6 @@
 	
 	<select id="selectWalletAgentRecordByMemIdTypeSymbol" resultType="com.xcong.excoin.modules.coin.entity.MemberAccountMoneyChange">
 		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">
@@ -54,5 +58,19 @@
         </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 '%佣金到账%' or content like '%活动%' or 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