From 2502f378fc7833f3f8225b9a98bcd2cca9111f91 Mon Sep 17 00:00:00 2001
From: jyy <935090232@qq.com>
Date: Fri, 12 Mar 2021 17:15:17 +0800
Subject: [PATCH] Merge remote-tracking branch 'origin/score_shop' into score_shop
---
zq-erp/src/main/java/com/matrix/system/fenxiao/action/FenXiaoUserAction.java | 29 ++++++++++++++---------------
1 files changed, 14 insertions(+), 15 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 1aafb7c..62a352d 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,22 +93,20 @@
result.putInMap("salesGrade", dataList);
return result;
}
+
/**
- * 改变发布状态：已发布
- * @param userId
- *
- */
- @RequestMapping(value = "/addSaleManApply")
- public @ResponseBody AjaxResult addSaleManApply(String userId,long gradeId) {
- AjaxResult result= AjaxResult.buildSuccessInstance("设置成功");
- SysUsers user = WebUtil.getSessionAttribute(MatrixConstance.LOGIN_KEY);
- shopSalesmanApplyService.addSaleManApply(userId,gradeId);
+ *新增分销员
+ */
+ @ApiOperation(value = "新增分销员")
+ @PostMapping(value = "/addSaleManApply")
+ public @ResponseBody
+ AjaxResult findShopSalesmanAppliingList(@RequestBody AddSaleManApplyDto addSaleManApplyDto) {
+ //设置用户公司ID
+ QueryUtil.setQueryLimitCom(addSaleManApplyDto);
+ AjaxResult result= AjaxResult.buildSuccessInstance("设置成功");
+
+ shopSalesmanApplyService.addSaleManApply(addSaleManApplyDto.getUserId(),addSaleManApplyDto.getGradeId());
return result;
- }
-
-
- public static void main(String[] args) {
- System.out.println("===="+Long.parseLong(""));
- }
+ }
}
--
Gitblit v1.9.1