From c6eb32287b298f94e2989672b5e7c3534179332b Mon Sep 17 00:00:00 2001
From: xiaoyong931011 <15274802129@163.com>
Date: Thu, 17 Mar 2022 09:50:51 +0800
Subject: [PATCH] Merge branch 'bea' of http://120.27.238.55:7000/r/exchange into bea

---
 src/main/resources/mapper/member/MemberAccountMoneyChangeDao.xml |   69 +++++++++++++++++++++++++++++++++-
 1 files changed, 67 insertions(+), 2 deletions(-)

diff --git a/src/main/resources/mapper/member/MemberAccountMoneyChangeDao.xml b/src/main/resources/mapper/member/MemberAccountMoneyChangeDao.xml
index 383b1d5..be6c9d8 100644
--- a/src/main/resources/mapper/member/MemberAccountMoneyChangeDao.xml
+++ b/src/main/resources/mapper/member/MemberAccountMoneyChangeDao.xml
@@ -14,10 +14,75 @@
 		select * from member_account_money_change where type = 3 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">
+            <where>
+            	type = 1
+                <if test="record.memberId != null" >
+                    and member_id=#{record.memberId}
+                </if>
+            </where>
+        </if>
+        order by id desc
+    </select>
+	
+	<select id="selectWalletContractRecordsInPage" resultType="com.xcong.excoin.modules.coin.entity.MemberAccountMoneyChange">
+		select * from member_account_money_change <if test="record != null">
+            <where>
+            	type = 2
+                <if test="record.memberId != null" >
+                    and member_id=#{record.memberId}
+                </if>
+            </where>
+        </if>
+        order by id desc
+    </select>
+
+	<select id="selectWalletAgentRecordsInPage" resultType="com.xcong.excoin.modules.coin.entity.MemberAccountMoneyChange">
+		select * from member_account_money_change <if test="record != null">
+            <where>
+            	type = 3
+                <if test="record.memberId != null" >
+                    and member_id=#{record.memberId}
+                </if>
+            </where>
+        </if>
+        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 * 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>
+
+    <select id="selectByMemberIdInPage" resultType="com.xcong.excoin.modules.coin.parameter.vo.UsdtToGusdVo">
+        select * from member_account_money_change
+            <if test="record != null">
+                <where>
+                    type = 1 and (content = '兑换GUSD' or content = '兑换USDT')
+                    <if test="record.memberId != null" >
+                        and member_id=#{record.memberId}
+                    </if>
+                </where>
+            </if>
+        order by id desc
+    </select>
 
 
+    <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 '%收款%')
+        order by create_time desc
+    </select>
 
 </mapper>
\ No newline at end of file

--
Gitblit v1.9.1