From 1d1685e699e731464302532bccfbed3c81d3e4d4 Mon Sep 17 00:00:00 2001
From: jyy <935090232@qq.com>
Date: Fri, 12 Mar 2021 10:10:04 +0800
Subject: [PATCH] 新增申请成为分销员接口6
---
zq-erp/src/main/java/com/matrix/system/fenxiao/action/FenXiaoUserAction.java | 108 ++++++++++++++++++++++++++++++++++--------------------
1 files changed, 68 insertions(+), 40 deletions(-)
diff --git a/zq-erp/src/main/java/com/matrix/system/fenxiao/action/FenXiaoUserAction.java b/zq-erp/src/main/java/com/matrix/system/fenxiao/action/FenXiaoUserAction.java
index 640f7c0..5538f6c 100644
--- a/zq-erp/src/main/java/com/matrix/system/fenxiao/action/FenXiaoUserAction.java
+++ b/zq-erp/src/main/java/com/matrix/system/fenxiao/action/FenXiaoUserAction.java
@@ -1,29 +1,20 @@
package com.matrix.system.fenxiao.action;
-import com.matrix.core.anotations.RemoveRequestToken;
-import com.matrix.core.constance.MatrixConstance;
+import com.baomidou.mybatisplus.core.metadata.IPage;
+import com.baomidou.mybatisplus.extension.plugins.pagination.Page;
import com.matrix.core.pojo.AjaxResult;
-import com.matrix.core.tools.WebUtil;
-import com.matrix.system.common.bean.BusParameterSettings;
-import com.matrix.system.common.bean.SysUsers;
-import com.matrix.system.hive.bean.ShoppingGoods;
-import com.matrix.system.hive.bean.SysShopInfo;
-
-import cn.hutool.core.collection.CollUtil;
-import cn.hutool.core.util.StrUtil;
-
+import com.matrix.core.tools.StringUtils;
+import com.matrix.system.fenxiao.dto.ShopSalesmanAppliingDto;
+import com.matrix.system.fenxiao.dto.ShopSalesmanApplyDto;
+import com.matrix.system.fenxiao.service.ShopSalesmanApplyService;
+import com.matrix.system.fenxiao.vo.ShopSalesmanAppliingVo;
+import com.matrix.system.fenxiao.vo.ShopSalesmanApplyVo;
+import com.matrix.system.hive.action.util.QueryUtil;
+import io.swagger.annotations.ApiOperation;
+import io.swagger.annotations.ApiResponse;
+import io.swagger.annotations.ApiResponses;
import org.springframework.beans.factory.annotation.Autowired;
import org.springframework.web.bind.annotation.*;
-
-import com.matrix.system.fenxiao.constant.FenxiaoSettingConstant;
-import com.matrix.system.fenxiao.service.FenXiaoSettingService;
-import com.matrix.system.fenxiao.service.ShopSalesmanApplyService;
-import com.matrix.system.fenxiao.vo.FenXiaoSettingVo;
-import com.matrix.system.fenxiao.vo.ShopSalesmanApplyVo;
-
-import java.util.ArrayList;
-import java.util.Arrays;
-import java.util.List;
@RestController
@RequestMapping(value = "/fenXiao/fenXiaoUser")
@@ -32,29 +23,66 @@
@Autowired
private ShopSalesmanApplyService shopSalesmanApplyService;
- /**
- * 修改公司维度的分销规则
- */
-// @PostMapping(value = "/fxImgUpload")
-// public @ResponseBody
-// AjaxResult updateFenXiaoSetting(@RequestBody BusParameterSettings busParameterSettings) {
-// return fenXiaoSettingService.updateFenXiaoSettingByCompanyId(busParameterSettings);
-// }
/**
- *获取分销员审核记录
+ * 查询分销员审核记录
*/
- @RequestMapping(value = "/fenXiaoUserApply")
- public AjaxResult selectFenXiaoUserApply() {
+ @ApiOperation(value = "查询分销员审核记录")
+ @ApiResponses({
+ @ApiResponse(code = 200, message = "OK", response = ShopSalesmanApplyVo.class)
+ })
+ @PostMapping(value = "/findShopSalesmanApplyList")
+ public @ResponseBody
+ AjaxResult findShopSalesmanApplyList(@RequestBody ShopSalesmanApplyDto shopSalesmanApplyDto) {
+ //设置用户公司ID
+ QueryUtil.setQueryLimitCom(shopSalesmanApplyDto);
+ //排序
+ if(StringUtils.isBlank(shopSalesmanApplyDto.getSort())){
+ shopSalesmanApplyDto.setSort("create_time");
+ shopSalesmanApplyDto.setOrder("desc");
+ }
+
+
+ Page<ShopSalesmanApplyVo> page = new Page(shopSalesmanApplyDto.getPageNum(), shopSalesmanApplyDto.getPageSize());
+
+ IPage<ShopSalesmanApplyVo> rows = shopSalesmanApplyService.findShopSalesmanApplyList(page,shopSalesmanApplyDto);
+ AjaxResult result = AjaxResult.buildSuccessInstance(rows.getRecords(),rows.getTotal());
- AjaxResult result= AjaxResult.buildSuccessInstance("查询成功");
- SysUsers user = WebUtil.getSessionAttribute(MatrixConstance.LOGIN_KEY);
- Long companyId = user.getCompanyId();
-
- //分销员审核记录
- List<ShopSalesmanApplyVo> shopSalesmanApplyVos = shopSalesmanApplyService.selectFenXiaoUserApplyByCompanyId(companyId);
- result.putInMap("fxshjl", shopSalesmanApplyVos);
+ return result;
+ }
+
+ /**
+ * 跳转 分销员待审核记录页面
+ *
+ @RequestMapping(value = "/shopSalesmanAppliing")
+ public String shopSalesmanAppliing() {
+ return "admin/fenxiao/fenxiao-apply";
+ }
+ */
+
+ /**
+ *获取分销员待审核记录
+ */
+ @ApiOperation(value = "查询分销员审核记录")
+ @ApiResponses({
+ @ApiResponse(code = 200, message = "OK", response = ShopSalesmanAppliingVo.class)
+ })
+ @PostMapping(value = "/findShopSalesmanAppliingList")
+ public @ResponseBody
+ AjaxResult findShopSalesmanAppliingList(@RequestBody ShopSalesmanAppliingDto shopSalesmanAppliingDto) {
+ //设置用户公司ID
+ QueryUtil.setQueryLimitCom(shopSalesmanAppliingDto);
+ //查询条件待审核状态
+ shopSalesmanAppliingDto.setApplyStatus(1);
+ //排序
+ if(StringUtils.isBlank(shopSalesmanAppliingDto.getSort())){
+ shopSalesmanAppliingDto.setSort("create_time");
+ shopSalesmanAppliingDto.setOrder("desc");
+ }
- return result;
+ Page<ShopSalesmanAppliingVo> page = new Page(shopSalesmanAppliingDto.getPageNum(), shopSalesmanAppliingDto.getPageSize());
+ IPage<ShopSalesmanAppliingVo> rows = shopSalesmanApplyService.findShopSalesmanAppliingList(page,shopSalesmanAppliingDto);
+ AjaxResult result = AjaxResult.buildSuccessInstance(rows.getRecords(),rows.getTotal());
+ return result;
}
}
--
Gitblit v1.9.1