From 62ac110599c57d06d517715f04d11d2e9809d538 Mon Sep 17 00:00:00 2001
From: jyy <935090232@qq.com>
Date: Thu, 11 Mar 2021 17:10:06 +0800
Subject: [PATCH] 新增申请成为分销员接口3
---
zq-erp/src/main/java/com/matrix/system/shopXcx/vo/SalesmanVo.java | 31 +++++++++++++++++++++++++++++++
zq-erp/src/main/java/com/matrix/system/fenxiao/service/ShopSalesmanApplyService.java | 2 +-
zq-erp/src/main/java/com/matrix/system/shopXcx/api/action/WxSalesmanAction.java | 17 +++++++++++++++++
zq-erp/src/main/java/com/matrix/system/fenxiao/dao/ShopSalesmanApplyDao.java | 5 +++++
zq-erp/src/main/resources/mybatis/mapper/fenxiao/ShopSalesmanApplyDao.xml | 4 ++++
5 files changed, 58 insertions(+), 1 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 1e6c074..9836223 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
@@ -1,7 +1,10 @@
package com.matrix.system.fenxiao.dao;
import com.baomidou.mybatisplus.core.mapper.BaseMapper;
+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;
/**
* @description 推广员申请记录
@@ -10,4 +13,6 @@
*/
public interface ShopSalesmanApplyDao extends BaseMapper<ShopSalesmanApply> {
+ IPage<SalesmanVo> selectInvitationuserList(Page<SalesmanVo> page);
+
}
\ No newline at end of file
diff --git a/zq-erp/src/main/java/com/matrix/system/fenxiao/service/ShopSalesmanApplyService.java b/zq-erp/src/main/java/com/matrix/system/fenxiao/service/ShopSalesmanApplyService.java
index 2d0f924..05453f9 100644
--- a/zq-erp/src/main/java/com/matrix/system/fenxiao/service/ShopSalesmanApplyService.java
+++ b/zq-erp/src/main/java/com/matrix/system/fenxiao/service/ShopSalesmanApplyService.java
@@ -56,7 +56,7 @@
checkApply.getApplyStatus()==ShopSalesmanApply.APPLY_STATUS_WTG){
ShopSalesmanApply shopSalesmanApply=new ShopSalesmanApply();
- shopSalesmanApply.setUserId(loginUser.getUserId());
+ shopSalesmanApply.setUserId(openId);
shopSalesmanApply.setCreateBy(loginUser.getNickName());
shopSalesmanApply.setApplyWay(ShopSalesmanApply.APPLY_WAY_SELF);
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 8587c97..8c23a39 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
@@ -1,6 +1,8 @@
package com.matrix.system.shopXcx.api.action;
import com.baomidou.mybatisplus.core.conditions.query.QueryWrapper;
+import com.baomidou.mybatisplus.core.metadata.IPage;
+import com.baomidou.mybatisplus.extension.plugins.pagination.Page;
import com.matrix.biz.bean.BizUser;
import com.matrix.biz.dao.BizUserDao;
import com.matrix.component.redis.RedisUserLoginUtils;
@@ -11,6 +13,7 @@
import com.matrix.core.tools.MD5Util;
import com.matrix.core.tools.PropertiesUtil;
import com.matrix.core.tools.StringUtils;
+import com.matrix.system.app.dto.BasePageDto;
import com.matrix.system.common.bean.BusParameterSettings;
import com.matrix.system.common.constance.AppConstance;
import com.matrix.system.common.dao.BusParameterSettingsDao;
@@ -20,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;
@@ -195,6 +199,19 @@
+ @ApiOperation(value = "获取下级列表", notes = "")
+ @PostMapping(value = "/getInvitationuserList")
+ @ApiResponses({
+ @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);
+ AjaxResult result=AjaxResult.buildSuccessInstance(shopSalesmanApplyIPage.getRecords());
+ return result;
+
+ }
diff --git a/zq-erp/src/main/java/com/matrix/system/shopXcx/vo/SalesmanVo.java b/zq-erp/src/main/java/com/matrix/system/shopXcx/vo/SalesmanVo.java
new file mode 100644
index 0000000..e85f7ca
--- /dev/null
+++ b/zq-erp/src/main/java/com/matrix/system/shopXcx/vo/SalesmanVo.java
@@ -0,0 +1,31 @@
+package com.matrix.system.shopXcx.vo;
+
+import io.swagger.annotations.ApiModel;
+import io.swagger.annotations.ApiModelProperty;
+import lombok.Data;
+
+@Data
+@ApiModel(value = "SalesmanVo", description = " 销售员信息返回参数类")
+public class SalesmanVo {
+
+ @ApiModelProperty(value = "昵称")
+ private String nickName;
+
+
+ @ApiModelProperty(value = "头像")
+ private String avatarUrl;
+
+
+ @ApiModelProperty(value = "手机号码")
+ private String phoneNumber;
+
+ @ApiModelProperty(value = "贡献订单数")
+ private String orderCount;
+
+
+ @ApiModelProperty(value = "贡献收益")
+ private Double revenueAmount;
+
+
+
+}
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 93c86e2..6d73251 100644
--- a/zq-erp/src/main/resources/mybatis/mapper/fenxiao/ShopSalesmanApplyDao.xml
+++ b/zq-erp/src/main/resources/mybatis/mapper/fenxiao/ShopSalesmanApplyDao.xml
@@ -34,4 +34,8 @@
<result property="companyId" column="company_id" />
</resultMap>
+ <select id="selectInvitationuserList" resultType="com.matrix.system.fenxiao.entity.ShopSalesmanApply">
+
+ </select>
+
</mapper>
\ No newline at end of file
--
Gitblit v1.9.1