From fada73e8fae923cc1c115ecdd8a303e8dffa3158 Mon Sep 17 00:00:00 2001
From: jyy <935090232@qq.com>
Date: Mon, 15 Mar 2021 14:38:07 +0800
Subject: [PATCH] 测试支付5
---
zq-erp/src/main/java/com/matrix/system/fenxiao/action/FenXiaoUserAction.java | 161 ++++++++++++++++++++++++++++++++++++++++++-----------
1 files changed, 126 insertions(+), 35 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..169a429 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,7 +1,7 @@
package com.matrix.system.fenxiao.action;
import cn.hutool.core.util.ObjectUtil;
-import com.baomidou.mybatisplus.core.conditions.query.QueryWrapper;
+import cn.hutool.core.util.StrUtil;
import com.baomidou.mybatisplus.core.metadata.IPage;
import com.baomidou.mybatisplus.extension.plugins.pagination.Page;
import com.matrix.biz.bean.BizUser;
@@ -12,19 +12,12 @@
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.entity.ShopSalesmanGrade;
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 +37,8 @@
private ShopSalesmanApplyDao shopSalesmanApplyDao;
@Autowired
private BizUserDao bizUserDao;
+ @Autowired
+ private ShopSalesmanGradeDao shopSalesmanGradeDao;
/**
* 分销员详情页面信息
@@ -60,7 +55,8 @@
AjaxResult result= AjaxResult.buildSuccessInstance("查询成功");
//根据OPENID查询基础信息
String userId = shopSalesmanDetailDto.getUserId();
- SalesmanBasicDetailVo salesmanBasicDetailVo = shopSalesmanApplyService.selectShopSalesmanDetailByOpenId(userId);
+ String applyId = shopSalesmanDetailDto.getApplyId();
+ SalesmanBasicDetailVo salesmanBasicDetailVo = shopSalesmanApplyService.selectShopSalesmanDetailByOpenId(userId,Long.parseLong(applyId));
result.putInMap("basicdetail", salesmanBasicDetailVo);
//排序
if(StringUtils.isBlank(shopSalesmanDetailDto.getSort())){
@@ -77,7 +73,86 @@
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);
+ }
+
+ /**
+ * 分佣方案
+ */
+ @ApiOperation(value = "查询分佣方案")
+ @ApiResponses({
+ @ApiResponse(code = 200, message = "OK", response = FyfaManageVo.class)
+ })
+ @PostMapping(value = "/findFyfaManageList")
+ public @ResponseBody
+ AjaxResult findFyfaManageList(@RequestBody FyfaManageDto fyfaManageDto) {
+ //设置用户公司ID
+ QueryUtil.setQueryLimitCom(fyfaManageDto);
+ //排序
+ if(StringUtils.isBlank(fyfaManageDto.getSort())){
+ fyfaManageDto.setSort("create_time");
+ fyfaManageDto.setOrder("asc");
+ }
+ Page<FyfaManageVo> page = new Page(fyfaManageDto.getPageNum(), fyfaManageDto.getPageSize());
+ IPage<FyfaManageVo> rows = shopSalesmanApplyService.findFyfaManageList(page,fyfaManageDto);
+ AjaxResult result = AjaxResult.buildSuccessInstance(rows.getRecords(),rows.getTotal());
+ return result;
+ }
+
+ /**
+ *新增分佣方案
+ */
+ @ApiOperation(value = "新增分佣方案")
+ @RequestMapping(value = "/addFyfa")
+ private @ResponseBody AjaxResult addFyfa(){
+ SysUsers user = WebUtil.getSessionAttribute(MatrixConstance.LOGIN_KEY);
+ shopSalesmanApplyService.addFyfa(user);
+ return AjaxResult.buildSuccessInstance("新增成功");
+ }
+
+ /**
+ *修改分佣方案
+ */
+ @ApiOperation(value = "修改分佣方案")
+ @PostMapping(value = "/updateFyfa")
+ public @ResponseBody
+ AjaxResult updateFyfa(@RequestBody UpdateFyfaDto updateFyfaDto) {
+ return shopSalesmanApplyService.updateFyfa(updateFyfaDto);
+ }
+
+ /**
+ *删除分佣方案
+ */
+ @ApiOperation(value = "删除分佣方案")
+ @PostMapping(value = "/delFyfaApply")
+ public @ResponseBody
+ AjaxResult delFyfaApply(@RequestBody DelFyfaApplyDto delFyfaApplyDto) {
+ return shopSalesmanApplyService.delFyfaApply(delFyfaApplyDto);
}
/**
@@ -107,7 +182,7 @@
/**
*获取分销员待审核记录
*/
- @ApiOperation(value = "查询分销员审核记录")
+ @ApiOperation(value = "获取分销员待审核记录")
@ApiResponses({
@ApiResponse(code = 200, message = "OK", response = ShopSalesmanAppliingVo.class)
})
@@ -131,32 +206,38 @@
}
/**
- *获取对应的分销员等级
- */
- @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 = "新增分销员")
@PostMapping(value = "/addSaleManApply")
public @ResponseBody
- AjaxResult findShopSalesmanAppliingList(@RequestBody AddSaleManApplyDto addSaleManApplyDto) {
+ AjaxResult addSaleManApply(@RequestBody AddSaleManApplyDto addSaleManApplyDto) {
+ String gradeId = addSaleManApplyDto.getGradeId();
+ if(StrUtil.isBlankOrUndefined(gradeId)) {
+ return AjaxResult.buildSuccessInstance("请选择分销等级");
+ }
+ ShopSalesmanGrade selectById = shopSalesmanGradeDao.selectById(Long.parseLong(gradeId));
+ if(ObjectUtil.isEmpty(selectById)) {
+ return AjaxResult.buildSuccessInstance("请选择分销等级");
+ }
+
//设置用户公司ID
QueryUtil.setQueryLimitCom(addSaleManApplyDto);
- AjaxResult result= AjaxResult.buildSuccessInstance("设置成功");
- shopSalesmanApplyService.addSaleManApply(addSaleManApplyDto.getUserId(),addSaleManApplyDto.getGradeId());
- return result;
+ shopSalesmanApplyService.addSaleManApply(addSaleManApplyDto.getOpenId(),gradeId);
+ return AjaxResult.buildSuccessInstance("设置成功");
}
+
+ /**
+ *删除---设置成不是分销员
+ */
+ @ApiOperation(value = "删除---设置成不是分销员")
+ @PostMapping(value = "/delSaleManGradeApply")
+ public @ResponseBody
+ AjaxResult delSaleManGradeApply(@RequestBody DelSaleManGradeApplyDto delSaleManGradeApplyDto) {
+ return shopSalesmanApplyService.delSaleManGradeApply(delSaleManGradeApplyDto);
+ }
+
/**
*审核分销员
*/
@@ -168,10 +249,7 @@
QueryUtil.setQueryLimitCom(examineSaleManApplyDto);
String userId = examineSaleManApplyDto.getUserId();
//待审核状态才允许提交
- QueryWrapper<ShopSalesmanApply> queryWrapperOrepool = new QueryWrapper<>();
- queryWrapperOrepool.eq("user_id", userId);
- queryWrapperOrepool.eq("company_id", examineSaleManApplyDto.getCompanyId());
- ShopSalesmanApply shopSalesmanApply = shopSalesmanApplyDao.selectOne(queryWrapperOrepool);
+ ShopSalesmanApply shopSalesmanApply = shopSalesmanApplyDao.selectById(examineSaleManApplyDto.getApplyId());
if(ObjectUtil.isEmpty(shopSalesmanApply)) {
return AjaxResult.buildFailInstance("当前记录有误");
}
@@ -191,4 +269,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