From a5150265e33e493efd96f8c43f3c46088fe92b55 Mon Sep 17 00:00:00 2001
From: jyy <935090232@qq.com>
Date: Fri, 12 Mar 2021 18:09:48 +0800
Subject: [PATCH] Merge remote-tracking branch 'origin/score_shop' into score_shop

---
 zq-erp/src/main/resources/mybatis/mapper/fenxiao/ShopSalesmanApplyDao.xml |   22 ++++++++++++++++++++++
 1 files changed, 22 insertions(+), 0 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 55b82c5..d49a599 100644
--- a/zq-erp/src/main/resources/mybatis/mapper/fenxiao/ShopSalesmanApplyDao.xml
+++ b/zq-erp/src/main/resources/mybatis/mapper/fenxiao/ShopSalesmanApplyDao.xml
@@ -132,6 +132,28 @@
 		  AND b.sales_user_id = #{openId}
 
 	) AS totalRevenue,
+	(
+		SELECT
+			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
+		  AND b.sales_user_id = #{openId}
+
+	) AS salesRevenue,
+	(
+		SELECT
+			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
+		  AND b.sales_user_id = #{openId}
+
+	) AS invitationRevenue,
 	IFNULL(withdrawal_cash,0) as withdrawal_cash,
 	(
 		SELECT

--
Gitblit v1.9.1