From 819f0f2f11936ca80903d545db7cbf5631dcdc5b Mon Sep 17 00:00:00 2001
From: xiaoyong931011 <15274802129@163.com>
Date: Thu, 11 Mar 2021 19:46:03 +0800
Subject: [PATCH] 分销员后台2
---
zq-erp/src/main/java/com/matrix/system/fenxiao/action/FenXiaoUserAction.java | 37 ++++++++++++++++++++++++++++++-------
1 files changed, 30 insertions(+), 7 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..1caaee3 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
@@ -3,19 +3,26 @@
import com.matrix.core.anotations.RemoveRequestToken;
import com.matrix.core.constance.MatrixConstance;
import com.matrix.core.pojo.AjaxResult;
+import com.matrix.core.tools.StringUtils;
import com.matrix.core.tools.WebUtil;
import com.matrix.system.common.bean.BusParameterSettings;
import com.matrix.system.common.bean.SysUsers;
+import com.matrix.system.common.tools.DataAuthUtil;
+import com.matrix.system.hive.action.util.QueryUtil;
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 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.dto.ShopSalesmanApplyDto;
import com.matrix.system.fenxiao.service.FenXiaoSettingService;
import com.matrix.system.fenxiao.service.ShopSalesmanApplyService;
import com.matrix.system.fenxiao.vo.FenXiaoSettingVo;
@@ -32,14 +39,30 @@
@Autowired
private ShopSalesmanApplyService shopSalesmanApplyService;
- /**
- * 修改公司维度的分销规则
+ /**
+ * 查询分销员审核记录
*/
-// @PostMapping(value = "/fxImgUpload")
-// public @ResponseBody
-// AjaxResult updateFenXiaoSetting(@RequestBody BusParameterSettings busParameterSettings) {
-// return fenXiaoSettingService.updateFenXiaoSettingByCompanyId(busParameterSettings);
-// }
+
+ @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("createTime");
+ shopSalesmanApplyDto.setOrder("desc");
+ }
+
+ List<ShopSalesmanApplyVo> rows = shopSalesmanApplyService.findShopSalesmanApplyList(shopSalesmanApplyDto);
+ Integer total = shopSalesmanApplyService.findShopSalesmanApplyListTotal(shopSalesmanApplyDto);
+ AjaxResult result = AjaxResult.buildSuccessInstance(rows, total);
+ return result;
+ }
/**
*获取分销员审核记录
*/
--
Gitblit v1.9.1