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 |   13 +++++++++++--
 1 files changed, 11 insertions(+), 2 deletions(-)

diff --git a/src/main/resources/mapper/member/MemberAccountMoneyChangeDao.xml b/src/main/resources/mapper/member/MemberAccountMoneyChangeDao.xml
index 1c47b40..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>
@@ -52,10 +60,11 @@
     </select>
     
 	<select id="selectWalletAgentIntoRecordsByMemIdTypeSymbol" resultType="com.xcong.excoin.modules.coin.entity.MemberAccountMoneyChange">
-		select * from member_account_money_change <if test="record != null">
+		select * from member_account_money_change 
+		<if test="record != null">
             <where>
             	type = 3
-            	and content like '%佣金到账%'
+            	and (content like '%佣金到账%' or content like '%活动%' or content like '%返利%')
                 <if test="record.memberId != null" >
                     and member_id=#{record.memberId}
                 </if>

--
Gitblit v1.9.1