From 10fe021916da34ecab032cf1c0ed26c4947f522a Mon Sep 17 00:00:00 2001
From: jyy <935090232@qq.com>
Date: Thu, 11 Mar 2021 18:12:35 +0800
Subject: [PATCH] 新增申请成为分销员接口4

---
 zq-erp/src/main/java/com/matrix/system/shopXcx/api/action/WxSalesmanAction.java |    7 +++----
 zq-erp/src/main/java/com/matrix/system/fenxiao/dao/ShopSalesmanApplyDao.java    |    4 ++--
 zq-erp/src/main/resources/mybatis/mapper/fenxiao/ShopSalesmanApplyDao.xml       |   25 +++++++++++++++++++++++--
 3 files changed, 28 insertions(+), 8 deletions(-)

diff --git a/zq-erp/src/main/java/com/matrix/system/fenxiao/dao/ShopSalesmanApplyDao.java b/zq-erp/src/main/java/com/matrix/system/fenxiao/dao/ShopSalesmanApplyDao.java
index 9836223..01a7b54 100644
--- a/zq-erp/src/main/java/com/matrix/system/fenxiao/dao/ShopSalesmanApplyDao.java
+++ b/zq-erp/src/main/java/com/matrix/system/fenxiao/dao/ShopSalesmanApplyDao.java
@@ -4,7 +4,7 @@
 import com.baomidou.mybatisplus.core.metadata.IPage;
 import com.baomidou.mybatisplus.extension.plugins.pagination.Page;
 import com.matrix.system.fenxiao.entity.ShopSalesmanApply;
-import com.matrix.system.shopXcx.vo.SalesmanVo;
+import org.apache.ibatis.annotations.Param;
 
 /**
  * @description 推广员申请记录
@@ -13,6 +13,6 @@
  */
 public interface ShopSalesmanApplyDao extends BaseMapper<ShopSalesmanApply> {
 
-    IPage<SalesmanVo> selectInvitationuserList(Page<SalesmanVo> page);
+    IPage<ShopSalesmanApply> selectInvitationuserInPage(@Param("openId") String openId, Page<ShopSalesmanApply> page);
 
 }
\ No newline at end of file
diff --git a/zq-erp/src/main/java/com/matrix/system/shopXcx/api/action/WxSalesmanAction.java b/zq-erp/src/main/java/com/matrix/system/shopXcx/api/action/WxSalesmanAction.java
index 8c23a39..a26b873 100644
--- a/zq-erp/src/main/java/com/matrix/system/shopXcx/api/action/WxSalesmanAction.java
+++ b/zq-erp/src/main/java/com/matrix/system/shopXcx/api/action/WxSalesmanAction.java
@@ -23,7 +23,6 @@
 import com.matrix.system.fenxiao.entity.ShopSalesmanApply;
 import com.matrix.system.fenxiao.service.ShopSalesmanApplyService;
 import com.matrix.system.shopXcx.api.WeChatApiTools;
-import com.matrix.system.shopXcx.vo.SalesmanVo;
 import io.swagger.annotations.Api;
 import io.swagger.annotations.ApiOperation;
 import io.swagger.annotations.ApiResponse;
@@ -205,9 +204,9 @@
             @ApiResponse(code = 200, message = "ok", response = BasePageDto.class)
     })
     AjaxResult getInvitationuserList(@RequestBody BasePageDto pageDto) {
-
-        Page<SalesmanVo> page=new Page<>(pageDto.getPageNum(),pageDto.getPageSize());
-        IPage<SalesmanVo> shopSalesmanApplyIPage = salesmanApplyDao.selectInvitationuserList(page);
+        BizUser loginUser = redisUserLoginUtils.getLoginUser(BizUser.class);
+        Page<ShopSalesmanApply> page=new Page<>(pageDto.getPageNum(),pageDto.getPageSize());
+        IPage<ShopSalesmanApply> shopSalesmanApplyIPage = salesmanApplyDao.selectInvitationuserInPage(loginUser.getOpenId(), page);
         AjaxResult result=AjaxResult.buildSuccessInstance(shopSalesmanApplyIPage.getRecords());
         return result;
 
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 6d73251..309ddfb 100644
--- a/zq-erp/src/main/resources/mybatis/mapper/fenxiao/ShopSalesmanApplyDao.xml
+++ b/zq-erp/src/main/resources/mybatis/mapper/fenxiao/ShopSalesmanApplyDao.xml
@@ -34,8 +34,29 @@
 			<result property="companyId" column="company_id" />
 	</resultMap>
 
-    <select id="selectInvitationuserList" resultType="com.matrix.system.fenxiao.entity.ShopSalesmanApply">
-
+	<select id="selectInvitationuserInPage" resultType="com.matrix.system.fenxiao.entity.ShopSalesmanApply">
+select  * from shop_salesman_apply
+<!--
+		SELECT
+			a.nick_name,
+			a.avatar_url,
+			a.phone_number,
+			(
+				SELECT
+					IFNULL(sum(IFNULL( b.amount, 0 )),0)
+				FROM
+					shop_salesman_order b
+				WHERE
+					b.user_id = a.open_id
+				  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
+			biz_user a
+		WHERE
+			a.parent_open_id = #{openId}
+		  AND a.is_sales = 1 -->
 	</select>
 
+
 </mapper>
\ No newline at end of file

--
Gitblit v1.9.1