From a7962f680b606fbd200550bfda679f0957f3c447 Mon Sep 17 00:00:00 2001
From: xiaoyong931011 <15274802129@163.com>
Date: Mon, 27 Sep 2021 15:44:12 +0800
Subject: [PATCH] Merge branch 'master' of http://120.27.238.55:7000/r/xc-mall
---
src/main/java/cc/mrbird/febs/mall/controller/AdminMallMemberController.java | 49 +++++++++++++++++++++++++++++++++++++++++++++++++
1 files changed, 49 insertions(+), 0 deletions(-)
diff --git a/src/main/java/cc/mrbird/febs/mall/controller/AdminMallMemberController.java b/src/main/java/cc/mrbird/febs/mall/controller/AdminMallMemberController.java
index c7b13bf..c253445 100644
--- a/src/main/java/cc/mrbird/febs/mall/controller/AdminMallMemberController.java
+++ b/src/main/java/cc/mrbird/febs/mall/controller/AdminMallMemberController.java
@@ -8,6 +8,8 @@
import cc.mrbird.febs.mall.entity.MallMember;
import cc.mrbird.febs.mall.entity.MallOrderRefund;
import cc.mrbird.febs.mall.service.IAdminMallMemberService;
+import cc.mrbird.febs.mall.vo.AdminAgentLevelOptionTreeVo;
+import cc.mrbird.febs.mall.vo.AdminMallGoodsCategoryTreeVo;
import lombok.RequiredArgsConstructor;
import lombok.extern.slf4j.Slf4j;
import org.springframework.validation.annotation.Validated;
@@ -15,6 +17,7 @@
import javax.validation.Valid;
import javax.validation.constraints.NotNull;
+import java.util.List;
import java.util.Map;
@Slf4j
@@ -152,6 +155,52 @@
return mallMemberService.agentLevelUpdate(agentLevelUpdateDto);
}
+ /**
+ * 代理-等级选择Option
+ */
+ @GetMapping("getAgentLevelOption/tree")
+ @ControllerEndpoint(exceptionMessage = "获取等级失败")
+ public List<AdminAgentLevelOptionTreeVo> getAgentLevelOption(){
+ return mallMemberService.getAgentLevelOption();
+ }
+
+
+ /**
+ * 代理列表-全部成员
+ */
+ @GetMapping("/agentChild")
+ public FebsResponse agentChild(QueryRequest request, MallMember mallMember, Integer parentId) {
+ if(parentId==null){
+ ViewMallMemberController.idFromAgentAllMember=0;
+ }
+ mallMember.setId(ViewMallMemberController.idFromAgentAllMember);
+ Map<String, Object> dataTable = getDataTable(mallMemberService.agentChild(request, mallMember));
+ return new FebsResponse().success().data(dataTable);
+ }
+
+ /**
+ * 奖励设置-列表
+ * @param rankAwardDto
+ * @param request
+ * @return
+ */
+ @GetMapping("getRankAwardList")
+ public FebsResponse getRankAwardList(RankAwardDto rankAwardDto, QueryRequest request) {
+ Map<String, Object> data = getDataTable(mallMemberService.getRankAwardList(rankAwardDto, request));
+ return new FebsResponse().success().data(data);
+ }
+
+ /**
+ * 奖励设置-更新
+ */
+ @PostMapping("rankAwardUpdate")
+ @ControllerEndpoint(operation = "奖励设置-更新", exceptionMessage = "操作失败")
+ public FebsResponse rankAwardUpdate(@Valid RankAwardUpdateDto rankAwardUpdateDto) {
+ return mallMemberService.rankAwardUpdate(rankAwardUpdateDto);
+ }
+
+
+
}
--
Gitblit v1.9.1