From d15555767aee94413eaf36f61cf482ae4a421c07 Mon Sep 17 00:00:00 2001
From: xiaoyong931011 <15274802129@163.com>
Date: Tue, 14 Jul 2020 18:45:16 +0800
Subject: [PATCH] 20200714   代码提交

---
 src/main/resources/mapper/modules/MemberMapper.xml |   31 ++++++++++---------------------
 1 files changed, 10 insertions(+), 21 deletions(-)

diff --git a/src/main/resources/mapper/modules/MemberMapper.xml b/src/main/resources/mapper/modules/MemberMapper.xml
index 753b6b1..5038ed9 100644
--- a/src/main/resources/mapper/modules/MemberMapper.xml
+++ b/src/main/resources/mapper/modules/MemberMapper.xml
@@ -140,22 +140,13 @@
 	</select>
 	<select id="selectReturnMoneyForBasicRealData" resultType="java.lang.String">
 		SELECT
-			IFNULL(SUM(s.amount),'0')
+			IFNULL(SUM(s.amount), '0')
 		FROM
 			member_account_money_change s
 		WHERE
 			s.type = 3
-		AND s.content LIKE '%佣金入账%'
+		AND s.content LIKE '%佣金到账%'
 		AND s. STATUS = '1'
-		AND s.member_id NOT IN (
-			SELECT
-				id
-			FROM
-				member
-			WHERE
-				account_type = '2'
-			AND account_status = '1'
-		)
 	</select>
 	<select id="selectClosingpriceForBasicRealData" resultType="java.lang.String">
 		SELECT
@@ -163,7 +154,7 @@
 		FROM
 			contract_order a
 		WHERE
-			a.closing_type IN (2, 3)
+		a.closing_type = '0'
 			and a.order_status = '1'
 		AND a.member_id NOT IN (
 			SELECT
@@ -181,7 +172,7 @@
 		FROM
 			contract_order a
 		WHERE
-			a.closing_type IN (4, 5, 6, 7, 8, 9)
+			a.closing_type IN (2,3,4, 5, 6, 7, 8, 9)
 			and a.order_status = '1'
 		AND a.member_id NOT IN (
 			SELECT
@@ -199,7 +190,7 @@
 		FROM
 			contract_order a
 		WHERE
-			a.closing_type IN (4, 5, 6, 7, 8, 9)
+			a.closing_type IN (2,3,4, 5, 6, 7, 8, 9)
 		AND a.order_status = '1'
 		AND a.member_id NOT IN (
 			SELECT
@@ -217,22 +208,20 @@
 		FROM
 			(
 				SELECT
-					a.id
+					s.id
 				FROM
-					contract_order a
+					contract_hold_order s
 				WHERE
-					a. closing_type IN (2, 3)
-					AND a.member_id NOT IN (
+					s.member_id IN (
 						SELECT
 							id
 						FROM
 							member
 						WHERE
-							account_type = '2'
-						AND account_status = '1'
+							account_type = '1'
 					)
 				GROUP BY
-					a.member_id
+					s.member_id
 			) b
 	</select>
 	<select id="selectBBZHForBasicRealData" resultType="java.lang.String">

--
Gitblit v1.9.1