From d388e2788b7ef088d7cd40f901b0acdcec460bc3 Mon Sep 17 00:00:00 2001
From: wzy <wzy19931122ai@163.com>
Date: Thu, 01 Apr 2021 00:19:23 +0800
Subject: [PATCH] modify

---
 zq-erp/src/main/resources/mybatis/mapper/fenxiao/ShopSalesmanApplyDao.xml |   20 +++++++++-----------
 1 files changed, 9 insertions(+), 11 deletions(-)

diff --git a/zq-erp/src/main/resources/mybatis/mapper/fenxiao/ShopSalesmanApplyDao.xml b/zq-erp/src/main/resources/mybatis/mapper/fenxiao/ShopSalesmanApplyDao.xml
index 038ebd0..9e7fba3 100644
--- a/zq-erp/src/main/resources/mybatis/mapper/fenxiao/ShopSalesmanApplyDao.xml
+++ b/zq-erp/src/main/resources/mybatis/mapper/fenxiao/ShopSalesmanApplyDao.xml
@@ -66,6 +66,7 @@
 		b.nick_name nickname,
 		(SELECT s.nick_name FROM biz_user s
 		WHERE s.open_id = a.parent_user_id ) parentUser,
+		c.nick_name parentUserNow,
 		( SELECT COUNT(*) FROM biz_user
 		WHERE parent_open_id = a.user_id AND is_sales != 1 ) lowerLevelNum,
 		( SELECT COUNT(*) FROM biz_user
@@ -82,6 +83,7 @@
 		shop_salesman_apply a
 		LEFT JOIN biz_user b ON a.user_id = b.open_id
 		LEFT JOIN shop_salesman_grade g ON a.grade_id = g.id
+		LEFT JOIN biz_user c ON c.open_id = b.parent_open_id
 		<where>
 		 	a.company_id=#{record.companyId}
 			<if test="record.shenheState != null and record.shenheState != ''">
@@ -182,8 +184,8 @@
 
 	) AS djsRevenue,
 
-	( SELECT count( * ) FROM shop_salesman_order c WHERE c.user_id = a.open_id AND c.sales_user_id = #{openId} and revenue_type =1 ) AS salesorderCount,
-	( SELECT count( * ) FROM shop_salesman_order c WHERE c.user_id = a.open_id AND c.sales_user_id = #{openId} and revenue_type =2 ) AS invitationOrderCount,
+	( SELECT count( * ) FROM shop_salesman_order c WHERE  c.sales_user_id = #{openId} and revenue_type =1 ) AS salesorderCount,
+	( SELECT count( * ) FROM shop_salesman_order c WHERE  c.sales_user_id = #{openId} and revenue_type =2 ) AS invitationOrderCount,
 	(select count(*) from biz_user where parent_open_id=#{openId} and is_sales=1) as invitationCount,
 	(select count(*) from biz_user where parent_open_id=#{openId} and is_sales=2) as customerCount
 	from biz_user a where
@@ -223,24 +225,20 @@
 		b.open_id userId,
 		b.avatar_url avatarUrl,
 		b.nick_name nickname,
-		a.create_time createTime,
-		a.apply_way applyWay,
-		(select COUNT(*) from shop_salesman_order c where c.order_status = 1 and c.sales_user_id = a.user_id) doneNum
-		FROM
-		shop_salesman_apply a
-		LEFT JOIN biz_user b ON b.parent_open_id = a.user_id
+		b.binding_parent_time createTime,
+		(select COUNT(*) from shop_salesman_order c where c.order_status = 1 and c.sales_user_id = b.open_id) doneNum
+		FROM biz_user b
 		<where>
-			a.company_id = #{record.companyId}
+			b.company_id = #{record.companyId}
 			AND b.is_sales != 1
 			and b.parent_open_id = #{record.userId}
-			and a.apply_status = 2
 			<if test="record.userName != null and record.userName != ''">
 				and b.nick_name like concat('%',#{record.userName},'%')
 			</if>
 		</where>
 		<if test="record.sort !=null">
 			order by
-			a.${record.sort} ${record.order}
+			b.${record.sort} ${record.order}
 		</if>
 	</select>
 	<select id="findCustomLow" resultType="com.matrix.system.fenxiao.vo.ShopCustomDetailVo">

--
Gitblit v1.9.1