From 608d72c5918bcec6e67320b28ea119ea50f8c84b Mon Sep 17 00:00:00 2001
From: jyy <935090232@qq.com>
Date: Fri, 12 Mar 2021 14:17:54 +0800
Subject: [PATCH] 新增申请成为分销员接口9

---
 zq-erp/src/main/resources/mybatis/mapper/fenxiao/ShopSalesmanApplyDao.xml |   50 +++++++++++++++++++++++++++++++++++---------------
 1 files changed, 35 insertions(+), 15 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 a621ad6..485509d 100644
--- a/zq-erp/src/main/resources/mybatis/mapper/fenxiao/ShopSalesmanApplyDao.xml
+++ b/zq-erp/src/main/resources/mybatis/mapper/fenxiao/ShopSalesmanApplyDao.xml
@@ -46,7 +46,9 @@
 					shop_salesman_order b
 				WHERE
 					b.user_id = a.open_id
+				  and order_status=2
 				  AND b.sales_user_id = #{openId}
+
 			) AS revenueAmount,
 			( SELECT count( * ) FROM shop_salesman_order c WHERE c.user_id = a.open_id AND c.sales_user_id = #{openId} ) AS orderCount
 		FROM
@@ -58,40 +60,58 @@
 
 	<select id="findShopSalesmanApplyList" resultType="com.matrix.system.fenxiao.vo.ShopSalesmanApplyVo">
 		SELECT
-		b.nick_name
+		a.user_id userId
 		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
 		<where>
-			and a.company_id=#{record.companyId}
+		 	a.company_id=#{record.companyId}
 			<if test="record.shenheState != null and record.shenheState != ''">
-				and a.apply_status=#{shenheState}
+				and a.apply_status=#{record.shenheState}
 			</if>
 		</where>
 		<if test="record.sort !=null">
 			order by
 			a.${record.sort} ${record.order}
 		</if>
-		<if test="record.offset >=0  and record.limit >0">
-			limit
-			#{record.offset},#{record.limit}
-		</if>
 	</select>
-
-	<select id="findShopSalesmanApplyListTotal" resultType="java.lang.Integer">
-		SELECT count(*)
+	<select id="findShopSalesmanAppliingList" resultType="com.matrix.system.fenxiao.vo.ShopSalesmanAppliingVo">
+		SELECT
+		a.user_id userId,
+		b.nick_name nickName
 		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
 		<where>
-			and a.company_id=#{record.companyId}
-			<if test="record.shenheState != null and record.shenheState != ''">
-				and a.apply_status=#{shenheState}
+			a.company_id = #{record.companyId}
+		    and a.apply_status = #{record.applyStatus}
+			<if test="record.nickName != null and record.nickName != ''">
+				and b.nick_name like concat('%',#{record.nickName},'%')
 			</if>
 		</where>
+		<if test="record.sort !=null">
+			order by
+			a.${record.sort} ${record.order}
+		</if>
 	</select>
-
+	<select id="selectBizUserApplyList" resultType="com.matrix.system.fenxiao.vo.ShopSalesmanAppliingVo">
+		SELECT
+		a.user_id userId,
+		a.nick_name nickName
+		FROM
+		biz_user a
+		<where>
+			a.company_id = #{record.companyId}
+			and a.is_sales != 1
+			<if test="record.nickName != null and record.nickName != ''">
+				and a.nick_name like concat('%',#{record.nickName},'%')
+			</if>
+		</where>
+		<if test="record.sort !=null">
+			order by
+			a.${record.sort} ${record.order}
+		</if>
+	</select>
 
 </mapper>
\ No newline at end of file

--
Gitblit v1.9.1