From 5e75c6faae3a68ec672db2ca509a2de9f863d0b6 Mon Sep 17 00:00:00 2001
From: xiaoyong931011 <15274802129@163.com>
Date: Tue, 15 Jun 2021 15:11:42 +0800
Subject: [PATCH] 20210615  最新价

---
 src/main/resources/mapper/modules/MemberAccountMoneyChangeMapper.xml |   70 ++++++++++++++++++++++++++++++++++-
 1 files changed, 68 insertions(+), 2 deletions(-)

diff --git a/src/main/resources/mapper/modules/MemberAccountMoneyChangeMapper.xml b/src/main/resources/mapper/modules/MemberAccountMoneyChangeMapper.xml
index 870285f..e855458 100644
--- a/src/main/resources/mapper/modules/MemberAccountMoneyChangeMapper.xml
+++ b/src/main/resources/mapper/modules/MemberAccountMoneyChangeMapper.xml
@@ -7,6 +7,8 @@
 			m.phone,
 			m.email,
 			m.invite_id inviteId,
+			m.account_type accountType,
+			s.member_id memberId,
 			s.symbol,
 			s.amount,
 			s.content,
@@ -18,13 +20,77 @@
 		LEFT JOIN member m ON m.id = s.member_id
 		<where>
 		s.type = 3 
-		and s.content like '%佣金入账%' 
+		and s.content like '%佣金到账%' 
+			<if test="record != null" >
+                <if test="record.account!=null and record.account!=''">
+                    and (m.phone = #{record.account} or m.email = #{record.account} or m.invite_id=#{record.account})
+                </if>
+                <if test="record.isTest!=null and record.isTest!=''">
+                    and m.account_type= #{record.isTest}
+                </if>
+            </if>
+		</where>
+		ORDER BY s.create_time DESC
+	</select>
+	
+    <select id="findMemberAgentReturnInfoAloneInPage" resultType="com.xcong.excoin.modules.member.entity.MemberAccountMoneyChangeEntity">
+		SELECT
+			m.phone,
+			m.email,
+			m.invite_id inviteId,
+			s.member_id,
+			s.symbol,
+			s.amount,
+			s.content,
+			s.create_time createTime,
+			s. STATUS,
+			s.type
+		FROM
+			member_account_money_change s
+		LEFT JOIN member m ON m.id = s.member_id
+		<where>
+		s.type = 3 
+		and (FIND_IN_SET('22015141', m.referer_ids) or m.id in (8,10))
+		and s.content like '%佣金到账%' 
 			<if test="record != null" >
                 <if test="record.account!=null and record.account!=''">
                     and (m.phone = #{record.account} or m.email = #{record.account} or m.invite_id=#{record.account})
                 </if>
             </if>
-		</where>	
+		</where>
+		ORDER BY s.create_time DESC
+	</select>
+	
+    <select id="findMemberAgentReturnInfoAloneTestInPage" resultType="com.xcong.excoin.modules.member.entity.MemberAccountMoneyChangeEntity">
+		SELECT
+			m.phone,
+			m.email,
+			m.invite_id inviteId,
+			s.member_id,
+			s.symbol,
+			s.amount,
+			s.content,
+			s.create_time createTime,
+			s. STATUS,
+			s.type
+		FROM
+			member_account_money_change s
+		LEFT JOIN member m ON m.id = s.member_id
+		<where>
+		s.type = 3 
+		and (m.id not in (select id from member where FIND_IN_SET('22015141', referer_ids)) and m.id not in (1,2,3,4,5,6,7,10))
+		and s.content like '%佣金到账%' 
+			<if test="record != null" >
+                <if test="record.account!=null and record.account!=''">
+                    and (m.phone = #{record.account} or m.email = #{record.account} or m.invite_id=#{record.account})
+                </if>
+            </if>
+		</where>
+		ORDER BY s.create_time DESC
+	</select>
+	
+	<select id="selectAccountMoneyChangeByMemberId" resultType="java.lang.String">
+		select IFNULL(SUM(s.amount), '0') AS allAmount from member_account_money_change s where s.content like '%佣金到账%' and s.member_id = #{memberId}
 	</select>
     
 </mapper>
\ No newline at end of file

--
Gitblit v1.9.1