From 5ebe08326ec43936d127bf704f3853adaf7b01c9 Mon Sep 17 00:00:00 2001
From: xiaoyong931011 <15274802129@163.com>
Date: Mon, 27 Sep 2021 11:28:54 +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 | 69 +++++++++++++++++++++++++++++++---
1 files changed, 62 insertions(+), 7 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 e688cbb..49dbf14 100644
--- a/src/main/java/cc/mrbird/febs/mall/controller/AdminMallMemberController.java
+++ b/src/main/java/cc/mrbird/febs/mall/controller/AdminMallMemberController.java
@@ -4,20 +4,20 @@
import cc.mrbird.febs.common.controller.BaseController;
import cc.mrbird.febs.common.entity.FebsResponse;
import cc.mrbird.febs.common.entity.QueryRequest;
-import cc.mrbird.febs.mall.dto.MoneyChargeListDto;
-import cc.mrbird.febs.mall.dto.MoneyFlowListDto;
+import cc.mrbird.febs.mall.dto.*;
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;
-import org.springframework.web.bind.annotation.GetMapping;
-import org.springframework.web.bind.annotation.PathVariable;
-import org.springframework.web.bind.annotation.RequestMapping;
-import org.springframework.web.bind.annotation.RestController;
+import org.springframework.web.bind.annotation.*;
+import javax.validation.Valid;
import javax.validation.constraints.NotNull;
+import java.util.List;
import java.util.Map;
@Slf4j
@@ -71,7 +71,7 @@
if(parentId==null){
ViewMallMemberController.idFromMoneyFlow=0;
}
- mallMember.setId(ViewMallOrderController.idFromRefund);
+ mallMember.setId(ViewMallMemberController.idFromMoneyFlow);
Map<String, Object> dataTable = getDataTable(mallMemberService.moneyFlow(request, mallMember));
return new FebsResponse().success().data(dataTable);
}
@@ -122,6 +122,61 @@
return mallMemberService.chargeDisagree(id);
}
+ /**
+ * 代理列表
+ * @param agentDto
+ * @param request
+ * @return
+ */
+ @GetMapping("getAgentList")
+ public FebsResponse getAgentList(AgentDto agentDto, QueryRequest request) {
+ Map<String, Object> data = getDataTable(mallMemberService.getAgentList(agentDto, request));
+ return new FebsResponse().success().data(data);
+ }
+
+ /**
+ * 代理级别-列表
+ * @param agentLevelDto
+ * @param request
+ * @return
+ */
+ @GetMapping("getAgentLevelList")
+ public FebsResponse getAgentLevelList(AgentLevelDto agentLevelDto, QueryRequest request) {
+ Map<String, Object> data = getDataTable(mallMemberService.getAgentLevelList(agentLevelDto, request));
+ return new FebsResponse().success().data(data);
+ }
+
+ /**
+ * 代理级别-更新
+ */
+ @PostMapping("agentLevelUpdate")
+ @ControllerEndpoint(operation = "商家支付方式-更新", exceptionMessage = "操作失败")
+ public FebsResponse agentLevelUpdate(@Valid AgentLevelUpdateDto agentLevelUpdateDto) {
+ 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);
+ }
}
--
Gitblit v1.9.1