From e84e71bda390661a98d2f548d11f3721d2ec110c Mon Sep 17 00:00:00 2001
From: jyy <935090232@qq.com>
Date: Fri, 12 Mar 2021 17:30:00 +0800
Subject: [PATCH] 新增申请成为分销员接口10
---
zq-erp/src/main/java/com/matrix/system/shopXcx/vo/SalesmanCenterInfo.java | 8 ++++++++
zq-erp/src/main/resources/mybatis/mapper/fenxiao/ShopSalesmanApplyDao.xml | 22 ++++++++++++++++++++++
2 files changed, 30 insertions(+), 0 deletions(-)
diff --git a/zq-erp/src/main/java/com/matrix/system/shopXcx/vo/SalesmanCenterInfo.java b/zq-erp/src/main/java/com/matrix/system/shopXcx/vo/SalesmanCenterInfo.java
index ca95447..f75ff89 100644
--- a/zq-erp/src/main/java/com/matrix/system/shopXcx/vo/SalesmanCenterInfo.java
+++ b/zq-erp/src/main/java/com/matrix/system/shopXcx/vo/SalesmanCenterInfo.java
@@ -12,6 +12,14 @@
private String totalRevenue;
+ @ApiModelProperty(value = "分销佣金")
+ private String salesRevenue;
+
+ @ApiModelProperty(value = "邀请奖励")
+ private String invitationRevenue;
+
+
+
@ApiModelProperty(value = "待结算收益")
private String djsRevenue;
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