~jiangyouyao/beauty-erp.git

			@@ -38,23 +38,23 @@
			SELECT
			a.nick_name,
			a.avatar_url,
			a.phone_number,
			a.phone,
			(
			SELECT
			IFNULL(sum(IFNULL( b.amount, 0 )),0)
			FROM
			shop_salesman_order b
			WHERE
			b.user_id = a.open_id
			b.user_id = a.id
			and order_status=2
			AND b.sales_user_id = #{openId}
			AND b.sales_user_id = #{userId}

			) AS revenueAmount,
			( SELECT count( * ) FROM shop_salesman_order c WHERE c.user_id = a.open_id AND c.sales_user_id = #{openId} ) AS orderCount
			( SELECT count( * ) FROM shop_salesman_order c WHERE c.user_id = a.id AND c.sales_user_id = #{userId} ) AS orderCount
			FROM
			biz_user a
			sys_vip_info a
			WHERE
			a.parent_open_id = #{openId}
			a.recommend_id = #{userId}
			AND a.is_sales = #{isSales}
			</select>

			@@ -64,13 +64,13 @@
			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 s.nick_name FROM sys_vip_info s
			WHERE s.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
			WHERE parent_open_id = a.user_id AND is_sales = 1 ) invitedNum,
			( SELECT COUNT(*) FROM sys_vip_info
			WHERE recommend_id = a.user_id AND is_sales != 1 ) lowerLevelNum,
			( SELECT COUNT(*) FROM sys_vip_info
			WHERE recommend_id = a.user_id AND is_sales = 1 ) invitedNum,
			( SELECT IFNULL(sum(IFNULL(amount, 0)), 0) FROM shop_salesman_order
			WHERE order_status = 2 AND sales_user_id = a.user_id ) totalRevenue,
			( SELECT IFNULL(sum(IFNULL(amount, 0)), 0) FROM shop_salesman_order
			@@ -81,9 +81,9 @@
			a.apply_way applyWay
			FROM
			shop_salesman_apply a
			LEFT JOIN biz_user b ON a.user_id = b.open_id
			LEFT JOIN sys_vip_info b ON a.user_id = b.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
			LEFT JOIN sys_vip_info c ON c.id = b.recommend_id
			<where>
			a.company_id=#{record.companyId}
			<if test="record.shenheState != null and record.shenheState != ''">
			@@ -107,7 +107,7 @@
			b.nick_name nickName
			FROM
			shop_salesman_apply a
			LEFT JOIN biz_user b ON a.user_id = b.user_id
			LEFT JOIN sys_vip_info b ON a.user_id = b.id
			<where>
			a.company_id = #{record.companyId}
			and a.apply_status = #{record.applyStatus}
			@@ -122,14 +122,13 @@
			</select>
			<select id="selectBizUserApplyList" resultType="com.matrix.system.fenxiao.vo.ShopSalesmanAppliingVo">
			SELECT
			a.user_id userId,
			a.open_id openId,
			a.id userId,
			a.nick_name nickName,
			a.avatar_url avatarUrl,
			a.create_time createTime,
			a.phone_number phone
			a.phone
			FROM
			biz_user a
			sys_vip_info a
			<where>
			a.company_id = #{record.companyId}
			and a.is_sales != 1
			@@ -186,10 +185,10 @@

			( 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
			a.open_id=#{openId}
			(select count(*) from sys_vip_info where recommend_id=#{openId} and is_sales=1) as invitationCount,
			(select count(*) from sys_vip_info where recommend_id=#{openId} and is_sales=2) as customerCount
			from sys_vip_info a where
			a.id=#{id}

			</select>

			@@ -199,13 +198,13 @@
			b.avatar_url avatarUrl,
			b.nick_name nickname,
			g.NAME grade,
			b.phone_number phone,
			(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 COUNT(*) FROM biz_user
			WHERE parent_open_id = a.user_id AND is_sales = 1 ) invitedNum,
			b.phone,
			(SELECT s.nick_name FROM sys_vip_info s
			WHERE s.id = a.parent_user_id ) parentUser,
			( SELECT COUNT(*) FROM sys_vip_info
			WHERE recommend_id = a.user_id AND is_sales != 1 ) lowerLevelNum,
			( SELECT COUNT(*) FROM sys_vip_info
			WHERE recommend_id = a.user_id AND is_sales = 1 ) invitedNum,
			( SELECT IFNULL(sum(IFNULL(amount, 0)), 0) FROM shop_salesman_order
			WHERE order_status = 2 AND sales_user_id = a.user_id ) totalRevenue,
			( SELECT IFNULL(sum(IFNULL(amount, 0)), 0) FROM shop_salesman_order
			@@ -215,23 +214,23 @@
			a.apply_way applyWay
			FROM
			shop_salesman_apply a
			LEFT JOIN biz_user b ON a.user_id = b.open_id
			LEFT JOIN sys_vip_info b ON a.user_id = b.id
			LEFT JOIN shop_salesman_grade g ON a.grade_id = g.id
			where a.id = #{applyId}
			</select>

			<select id="findCustomDetail" resultType="com.matrix.system.fenxiao.vo.ShopCustomDetailVo">
			SELECT
			b.open_id userId,
			b.id userId,
			b.avatar_url avatarUrl,
			b.nick_name nickname,
			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
			(select COUNT(*) from shop_salesman_order c where c.order_status = 1 and c.sales_user_id = b.id) doneNum
			FROM sys_vip_info b
			<where>
			b.company_id = #{record.companyId}
			AND b.is_sales != 1
			and b.parent_open_id = #{record.userId}
			and b.recommend_id = #{record.userId}
			<if test="record.userName != null and record.userName != ''">
			and b.nick_name like concat('%',#{record.userName},'%')
			</if>
			@@ -243,18 +242,18 @@
			</select>
			<select id="findCustomLow" resultType="com.matrix.system.fenxiao.vo.ShopCustomDetailVo">
			SELECT
			b.open_id userId,
			b.id userId,
			b.avatar_url avatarUrl,
			b.nick_name nickname,
			a.create_time createTime,
			a.apply_way applyWay
			FROM
			shop_salesman_apply a
			LEFT JOIN biz_user b ON b.open_id = a.user_id
			LEFT JOIN sys_vip_info b ON b.id = a.user_id
			<where>
			a.company_id = #{record.companyId}
			AND b.is_sales = 1
			and b.parent_open_id = #{record.userId}
			and b.recommend_id = #{record.userId}
			and a.apply_status = 2
			<if test="record.userName != null and record.userName != ''">
			and b.nick_name like concat('%',#{record.userName},'%')
			@@ -280,7 +279,7 @@
			c.order_status orderState,
			f.shop_name storeName
			from shop_salesman_order a
			left join biz_user b on b.open_id=a.user_id
			left join sys_vip_info b on b.id=a.user_id
			left join shop_order c on a.order_id=c.id
			LEFT JOIN sys_shop_info f on f.id = c.store_id
			<where>