From 8c32fe69d8a0cd12617e1487f5aff689814faaaa Mon Sep 17 00:00:00 2001
From: xiaoyong931011 <15274802129@163.com>
Date: Fri, 12 Mar 2021 18:28:35 +0800
Subject: [PATCH] 分销员后台0312

---
 zq-erp/src/main/resources/mybatis/mapper/fenxiao/ShopSalesmanApplyDao.xml |   30 ++++++++++++++++++++++++++----
 1 files changed, 26 insertions(+), 4 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 89ef382..7c8028c 100644
--- a/zq-erp/src/main/resources/mybatis/mapper/fenxiao/ShopSalesmanApplyDao.xml
+++ b/zq-erp/src/main/resources/mybatis/mapper/fenxiao/ShopSalesmanApplyDao.xml
@@ -60,15 +60,35 @@
 
 	<select id="findShopSalesmanApplyList" resultType="com.matrix.system.fenxiao.vo.ShopSalesmanApplyVo">
 		SELECT
-		a.user_id userId
+		a.user_id userId,
+		b.avatar_url avatarUrl,
+		b.nick_name nickname,
+		(SELECT s.nick_name FROM biz_user s
+		WHERE s.open_id = a.parent_user_id ) parentUser,
+		( SELECT COUNT(*) FROM biz_user
+		WHERE parent_open_id = a.user_id AND is_sales != 1 ) lowerLevelNum,
+		( SELECT IFNULL(sum(IFNULL(amount, 0)), 0) FROM shop_salesman_order
+		WHERE user_id = a.user_id AND order_status = 2 AND sales_user_id = a.user_id ) totalRevenue,
+		( SELECT IFNULL(sum(IFNULL(amount, 0)), 0) FROM shop_salesman_order
+		WHERE user_id = a.user_id AND order_status = 1 AND sales_user_id = a.user_id ) balance,
+		g.NAME grade,
+		a.create_time createTime,
+		a.apply_status applyStatus,
+		a.apply_way applyWay
 		FROM
 		shop_salesman_apply a
-		LEFT JOIN biz_user b ON a.user_id = b.user_id
-		LEFT JOIN shop_salesman_grade g ON b.salesman_grade = g.id
+		LEFT JOIN biz_user b ON a.user_id = b.open_id
+		LEFT JOIN shop_salesman_grade g ON a.grade_id = g.id
 		<where>
 		 	a.company_id=#{record.companyId}
 			<if test="record.shenheState != null and record.shenheState != ''">
 				and a.apply_status=#{record.shenheState}
+			</if>
+			<if test="record.salemanGrade != null and record.salemanGrade != ''">
+				and a.grade_id=#{record.salemanGrade}
+			</if>
+			<if test="record.userName != null and record.userName != ''">
+				and b.nick_name like concat('%',#{record.userName},'%')
 			</if>
 		</where>
 		<if test="record.sort !=null">
@@ -97,13 +117,15 @@
 	</select>
 	<select id="selectBizUserApplyList" resultType="com.matrix.system.fenxiao.vo.ShopSalesmanAppliingVo">
 		SELECT
-		a.user_id userId,
+		a.open_id userId,
 		a.nick_name nickName
 		FROM
 		biz_user a
+		LEFT JOIN shop_salesman_apply b ON a.open_id = b.user_id
 		<where>
 			a.company_id = #{record.companyId}
 			and a.is_sales != 1
+			and b.apply_status != 1
 			<if test="record.nickName != null and record.nickName != ''">
 				and a.nick_name like concat('%',#{record.nickName},'%')
 			</if>

--
Gitblit v1.9.1