From 000e2719d57fd6cfc94fb340730ab3722d6c47cb Mon Sep 17 00:00:00 2001
From: xiaoyong931011 <15274802129@163.com>
Date: Sun, 14 Mar 2021 14:33:14 +0800
Subject: [PATCH] 分销员后台0314
---
zq-erp/src/main/java/com/matrix/system/fenxiao/action/FenXiaoUserAction.java | 80 +++++++++++++++++++++++++++------------
1 files changed, 55 insertions(+), 25 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 cd91bc3..f462439 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
@@ -12,19 +12,11 @@
import com.matrix.core.tools.WebUtil;
import com.matrix.system.common.bean.SysUsers;
import com.matrix.system.fenxiao.dao.ShopSalesmanApplyDao;
-import com.matrix.system.fenxiao.dto.AddSaleManApplyDto;
-import com.matrix.system.fenxiao.dto.ExamineSaleManApplyDto;
-import com.matrix.system.fenxiao.dto.ShopSalesmanAppliingDto;
-import com.matrix.system.fenxiao.dto.ShopSalesmanApplyDto;
-import com.matrix.system.fenxiao.dto.ShopSalesmanDetailDto;
+import com.matrix.system.fenxiao.dao.ShopSalesmanGradeDao;
+import com.matrix.system.fenxiao.dto.*;
import com.matrix.system.fenxiao.entity.ShopSalesmanApply;
import com.matrix.system.fenxiao.service.ShopSalesmanApplyService;
-import com.matrix.system.fenxiao.vo.SalesmanBasicDetailVo;
-import com.matrix.system.fenxiao.vo.ShopCustomDetailVo;
-import com.matrix.system.fenxiao.vo.ShopSalesmanAppliingVo;
-import com.matrix.system.fenxiao.vo.ShopSalesmanApplyVo;
-import com.matrix.system.fenxiao.vo.ShopSalesmanDetailVo;
-import com.matrix.system.fenxiao.vo.ShopSalesmanGradeVo;
+import com.matrix.system.fenxiao.vo.*;
import com.matrix.system.hive.action.util.QueryUtil;
import io.swagger.annotations.ApiOperation;
import io.swagger.annotations.ApiResponse;
@@ -44,6 +36,8 @@
private ShopSalesmanApplyDao shopSalesmanApplyDao;
@Autowired
private BizUserDao bizUserDao;
+ @Autowired
+ private ShopSalesmanGradeDao shopSalesmanGradeDao;
/**
* 分销员详情页面信息
@@ -77,7 +71,32 @@
IPage<ShopCustomDetailVo> customLowRows = shopSalesmanApplyService.findCustomLow(pageLow,shopSalesmanDetailDto);
result.putInMap("customLowRecords", customLowRows.getRecords());
result.putInMap("customLowTotal", customLowRows.getTotal());
+ //查询收益订单
+ Page<ShopOrderDetailVo> pageOrder = new Page(shopSalesmanDetailDto.getPageNum(), shopSalesmanDetailDto.getPageSize());
+ IPage<ShopOrderDetailVo> orderRows = shopSalesmanApplyService.findShopOrderDetail(pageOrder,shopSalesmanDetailDto);
+ result.putInMap("orderRecords", orderRows.getRecords());
+ result.putInMap("orderTotal", orderRows.getTotal());
return result;
+ }
+
+ /**
+ *修改等级
+ */
+ @ApiOperation(value = "修改等级")
+ @PostMapping(value = "/changeSaleManGrade")
+ public @ResponseBody
+ AjaxResult changeSaleManGrade(@RequestBody ChangeSaleManGradeDto changeSaleManGradeDto) {
+ return shopSalesmanApplyService.changeSaleManGrade(changeSaleManGradeDto);
+ }
+
+ /**
+ *解绑
+ */
+ @ApiOperation(value = "解绑")
+ @PostMapping(value = "/unbundlingSaleMan")
+ public @ResponseBody
+ AjaxResult unbundlingSaleMan(@RequestBody UnbundlingSaleManDto unbundlingSaleManDto) {
+ return shopSalesmanApplyService.unbundlingSaleMan(unbundlingSaleManDto);
}
/**
@@ -107,7 +126,7 @@
/**
*获取分销员待审核记录
*/
- @ApiOperation(value = "查询分销员审核记录")
+ @ApiOperation(value = "获取分销员待审核记录")
@ApiResponses({
@ApiResponse(code = 200, message = "OK", response = ShopSalesmanAppliingVo.class)
})
@@ -131,19 +150,6 @@
}
/**
- *获取对应的分销员等级
- */
- @RequestMapping(value = "/getShopSalesmanGrade")
- private @ResponseBody AjaxResult getShopSalesmanGradeVo(){
- AjaxResult result= AjaxResult.buildSuccessInstance("查询成功");
- SysUsers user = WebUtil.getSessionAttribute(MatrixConstance.LOGIN_KEY);
-
- List<ShopSalesmanGradeVo> dataList = shopSalesmanApplyService.getShopSalesmanGradeVo(user.getCompanyId());
- result.putInMap("salesGrade", dataList);
- return result;
- }
-
- /**
*新增分销员
*/
@ApiOperation(value = "新增分销员")
@@ -157,6 +163,17 @@
shopSalesmanApplyService.addSaleManApply(addSaleManApplyDto.getUserId(),addSaleManApplyDto.getGradeId());
return result;
}
+
+ /**
+ *删除---设置成不是分销员
+ */
+ @ApiOperation(value = "删除---设置成不是分销员")
+ @PostMapping(value = "/delSaleManGradeApply")
+ public @ResponseBody
+ AjaxResult delSaleManGradeApply(@RequestBody DelSaleManGradeApplyDto delSaleManGradeApplyDto) {
+ return shopSalesmanApplyService.delSaleManGradeApply(delSaleManGradeApplyDto);
+ }
+
/**
*审核分销员
*/
@@ -191,4 +208,17 @@
}
}
+ /**
+ *获取对应的分销员等级
+ */
+ @RequestMapping(value = "/getShopSalesmanGrade")
+ private @ResponseBody AjaxResult getShopSalesmanGradeVo(){
+ AjaxResult result= AjaxResult.buildSuccessInstance("查询成功");
+ SysUsers user = WebUtil.getSessionAttribute(MatrixConstance.LOGIN_KEY);
+
+ List<ShopSalesmanGradeVo> dataList = shopSalesmanApplyService.getShopSalesmanGradeVo(user.getCompanyId());
+ result.putInMap("salesGrade", dataList);
+ return result;
+ }
+
}
--
Gitblit v1.9.1