~jiangyouyao/beauty-erp.git

			@@ -73,7 +73,7 @@
			( 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,
			b.binding_parent_time createTime,
			a.create_time createTime,
			a.apply_status applyStatus,
			a.apply_way applyWay
			FROM
			@@ -147,9 +147,7 @@
			IFNULL(sum(IFNULL( b.amount, 0 )),0)
			FROM
			shop_salesman_order b
			WHERE
			b.user_id = a.open_id
			and order_status=2
			WHERE order_status=2
			AND b.sales_user_id = #{openId}

			) AS totalRevenue,
			@@ -158,9 +156,7 @@
			IFNULL(sum(IFNULL( b.amount, 0 )),0)
			FROM
			shop_salesman_order b
			WHERE
			b.user_id = a.open_id
			and order_status=2 and revenue_type=1
			WHERE order_status=2 and revenue_type=1
			AND b.sales_user_id = #{openId}

			) AS salesRevenue,
			@@ -169,9 +165,7 @@
			IFNULL(sum(IFNULL( b.amount, 0 )),0)
			FROM
			shop_salesman_order b
			WHERE
			b.user_id = a.open_id
			and order_status=2 and revenue_type=2
			WHERE order_status=2 and revenue_type=2
			AND b.sales_user_id = #{openId}

			) AS invitationRevenue,
			@@ -181,13 +175,13 @@
			IFNULL(sum(IFNULL( b.amount, 0 )),0)
			FROM
			shop_salesman_order b
			WHERE
			b.user_id = a.open_id
			and order_status=1
			WHERE order_status=1
			AND b.sales_user_id = #{openId}

			) AS djsRevenue,
			( 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.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 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
			@@ -212,7 +206,7 @@
			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,
			b.binding_parent_time createTime,
			a.create_time createTime,
			a.apply_status applyStatus,
			a.apply_way applyWay
			FROM