From c744ee1d7296080e80272e084ebe016d04169b6a Mon Sep 17 00:00:00 2001
From: jyy <935090232@qq.com>
Date: Thu, 11 Mar 2021 18:27:07 +0800
Subject: [PATCH] 新增申请成为分销员接口4
---
zq-erp/src/main/java/com/matrix/system/shopXcx/api/action/WxSalesmanAction.java | 5 +++--
zq-erp/src/test/java/com/matrix/SourceFlowTests.java | 6 ++----
zq-erp/src/main/java/com/matrix/system/fenxiao/dao/ShopSalesmanApplyDao.java | 3 ++-
zq-erp/src/main/resources/mybatis/mapper/fenxiao/ShopSalesmanApplyDao.xml | 6 ++----
4 files changed, 9 insertions(+), 11 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 aa5269f..bfd6421 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,6 +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;
/**
@@ -13,6 +14,6 @@
*/
public interface ShopSalesmanApplyDao extends BaseMapper<ShopSalesmanApply> {
- IPage<ShopSalesmanApply> selectInvitationuserInPage(Page<ShopSalesmanApply> page, @Param("openId") String openId);
+ IPage<SalesmanVo> selectInvitationuserInPage(Page<SalesmanVo> page, @Param("openId") String openId);
}
\ 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 c918a59..c5156bf 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,6 +23,7 @@
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,8 +206,8 @@
})
AjaxResult getInvitationuserList(@RequestBody BasePageDto pageDto) {
BizUser loginUser = redisUserLoginUtils.getLoginUser(BizUser.class);
- Page<ShopSalesmanApply> page=new Page<>(pageDto.getPageNum(),pageDto.getPageSize());
- IPage<ShopSalesmanApply> shopSalesmanApplyIPage = salesmanApplyDao.selectInvitationuserInPage(page, loginUser.getOpenId());
+ Page<SalesmanVo> page=new Page<>(pageDto.getPageNum(),pageDto.getPageSize());
+ IPage<SalesmanVo> shopSalesmanApplyIPage = salesmanApplyDao.selectInvitationuserInPage(page, loginUser.getOpenId());
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 309ddfb..927d7f8 100644
--- a/zq-erp/src/main/resources/mybatis/mapper/fenxiao/ShopSalesmanApplyDao.xml
+++ b/zq-erp/src/main/resources/mybatis/mapper/fenxiao/ShopSalesmanApplyDao.xml
@@ -34,9 +34,7 @@
<result property="companyId" column="company_id" />
</resultMap>
- <select id="selectInvitationuserInPage" resultType="com.matrix.system.fenxiao.entity.ShopSalesmanApply">
-select * from shop_salesman_apply
-<!--
+ <select id="selectInvitationuserInPage" resultType="com.matrix.system.shopXcx.vo.SalesmanVo">
SELECT
a.nick_name,
a.avatar_url,
@@ -55,7 +53,7 @@
biz_user a
WHERE
a.parent_open_id = #{openId}
- AND a.is_sales = 1 -->
+ AND a.is_sales = 1
</select>
diff --git a/zq-erp/src/test/java/com/matrix/SourceFlowTests.java b/zq-erp/src/test/java/com/matrix/SourceFlowTests.java
index 6894647..2858713 100644
--- a/zq-erp/src/test/java/com/matrix/SourceFlowTests.java
+++ b/zq-erp/src/test/java/com/matrix/SourceFlowTests.java
@@ -2,13 +2,11 @@
import com.baomidou.mybatisplus.extension.plugins.pagination.Page;
import com.matrix.core.tools.StringUtils;
-import com.matrix.system.constance.Dictionary;
import com.matrix.system.fenxiao.dao.ShopSalesmanApplyDao;
-import com.matrix.system.fenxiao.entity.ShopSalesmanApply;
import com.matrix.system.hive.bean.*;
import com.matrix.system.hive.dao.*;
import com.matrix.system.hive.service.CodeService;
-import com.matrix.system.hive.service.SysOrderService;
+import com.matrix.system.shopXcx.vo.SalesmanVo;
import org.junit.Test;
import org.junit.runner.RunWith;
import org.springframework.beans.factory.annotation.Autowired;
@@ -179,7 +177,7 @@
@Test
public void inPageTest() {
- Page<ShopSalesmanApply> page = new Page<>(1, 10);
+ Page<SalesmanVo> page = new Page<>(1, 10);
salesmanApplyDao.selectInvitationuserInPage(page, "oLdgp47g7SXJnmti1iDzQaJpXNz4");
}
--
Gitblit v1.9.1