From a1c73f2cb7b4b070956b2e19d6ea1a1498d193f9 Mon Sep 17 00:00:00 2001
From: xiaoyong931011 <15274802129@163.com>
Date: Fri, 12 Mar 2021 13:07:07 +0800
Subject: [PATCH] 分销员后台6
---
zq-erp/src/main/resources/templates/views/admin/fenxiao/fenxiao-apply.html | 13 ++++++++++---
zq-erp/src/main/java/com/matrix/system/fenxiao/service/ShopSalesmanApplyService.java | 4 ++--
zq-erp/pom.xml | 4 ++--
zq-erp/src/main/java/com/matrix/system/fenxiao/action/FenXiaoUserAction.java | 20 +++++++++++---------
zq-erp/src/main/java/com/matrix/system/fenxiao/dto/AddSaleManApplyDto.java | 17 +++++++++++++++++
5 files changed, 42 insertions(+), 16 deletions(-)
diff --git a/zq-erp/pom.xml b/zq-erp/pom.xml
index f11f7a0..6590214 100644
--- a/zq-erp/pom.xml
+++ b/zq-erp/pom.xml
@@ -394,12 +394,12 @@
<exclude>config/test/*</exclude>
<exclude>config/xcx/*</exclude>
- <!---->
+ <!--
<exclude>config/config.json</exclude>
<exclude>config/application.properties</exclude>
<exclude>config/system.properties</exclude>
-
+-->
<exclude>**/*.woff</exclude>
<exclude>**/*.woff2</exclude>
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 3b9a014..dbfae36 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
@@ -7,6 +7,7 @@
import com.matrix.core.tools.StringUtils;
import com.matrix.core.tools.WebUtil;
import com.matrix.system.common.bean.SysUsers;
+import com.matrix.system.fenxiao.dto.AddSaleManApplyDto;
import com.matrix.system.fenxiao.dto.ShopSalesmanAppliingDto;
import com.matrix.system.fenxiao.dto.ShopSalesmanApplyDto;
import com.matrix.system.fenxiao.service.ShopSalesmanApplyService;
@@ -92,17 +93,18 @@
result.putInMap("salesGrade", dataList);
return result;
}
+
/**
- * 改变发布状态：已发布
- * @param userId
- *
- */
- @RequestMapping(value = "/addSaleManApply")
- public @ResponseBody AjaxResult addSaleManApply(String userId,long gradeId) {
- AjaxResult result= AjaxResult.buildSuccessInstance("设置成功");
+ *新增分销员
+ */
+ @ApiOperation(value = "新增分销员")
+ @PostMapping(value = "/addSaleManApply")
+ public @ResponseBody
+ AjaxResult findShopSalesmanAppliingList(@RequestBody AddSaleManApplyDto addSaleManApplyDto) {
+ AjaxResult result= AjaxResult.buildSuccessInstance("设置成功");
SysUsers user = WebUtil.getSessionAttribute(MatrixConstance.LOGIN_KEY);
- shopSalesmanApplyService.addSaleManApply(userId,gradeId);
+ shopSalesmanApplyService.addSaleManApply(addSaleManApplyDto.getUserId(),addSaleManApplyDto.getGradeId());
return result;
- }
+ }
}
diff --git a/zq-erp/src/main/java/com/matrix/system/fenxiao/dto/AddSaleManApplyDto.java b/zq-erp/src/main/java/com/matrix/system/fenxiao/dto/AddSaleManApplyDto.java
new file mode 100644
index 0000000..fefa925
--- /dev/null
+++ b/zq-erp/src/main/java/com/matrix/system/fenxiao/dto/AddSaleManApplyDto.java
@@ -0,0 +1,17 @@
+package com.matrix.system.fenxiao.dto;
+
+import io.swagger.annotations.ApiModel;
+import io.swagger.annotations.ApiModelProperty;
+import lombok.Data;
+
+@Data
+@ApiModel(value = "AddSaleManApplyDto", description = "查询参数")
+public class AddSaleManApplyDto {
+
+ @ApiModelProperty(value ="会员ID")
+ private String userId;
+
+ @ApiModelProperty(value ="等级ID")
+ private String gradeId;
+
+}
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 4b888a2..fc38e81 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
@@ -134,10 +134,10 @@
return shopSalesmanGradeDao.getShopSalesmanGradeVo(companyId);
}
- public void addSaleManApply(String userId,long gradeId) {
+ public void addSaleManApply(String userId,String gradeId) {
BizUser user = bizUserDao.selectById(userId);
- applyToBeAnSalesman(user.getOpenId(),gradeId+"", "");
+ applyToBeAnSalesman(user.getOpenId(),gradeId, "");
}
diff --git a/zq-erp/src/main/resources/templates/views/admin/fenxiao/fenxiao-apply.html b/zq-erp/src/main/resources/templates/views/admin/fenxiao/fenxiao-apply.html
index 4e3352e..0f2728e 100644
--- a/zq-erp/src/main/resources/templates/views/admin/fenxiao/fenxiao-apply.html
+++ b/zq-erp/src/main/resources/templates/views/admin/fenxiao/fenxiao-apply.html
@@ -107,6 +107,7 @@
order:'',
sort:''
},
+ proJbruserValue : "",
salesGradeList: [],
height:'calc(100vh - 240px)',
},
@@ -119,13 +120,19 @@
addSaleManApply(row){
let _this = this;
let userId = row.userId;
- let gradeId = row.salesGrade;
+ let gradeId = row.proJbruserValue;
+ alert(gradeId);
+ let obj = {
+ userId: userId,
+ gradeId: gradeId,
+ }
AjaxProxy.requst({
app: _this,
- data:[],
- url: basePath + '/fenXiao/fenXiaoUser/addSaleManApply?userId='+userId+'&gradeId='+gradeId,
+ data:obj,
+ url: basePath + '/fenXiao/fenXiaoUser/addSaleManApply',
callback: function (data) {
_this.$message.success(data.info);
+ this.loadData();
}
});
},
--
Gitblit v1.9.1