From cd8e45d63020e5b6cbff26ec604fa87501884016 Mon Sep 17 00:00:00 2001
From: Helius <wangdoubleone@gmail.com>
Date: Mon, 27 Sep 2021 10:33:34 +0800
Subject: [PATCH] fix

---
 src/main/java/cc/mrbird/febs/mall/controller/AdminMallMemberController.java |   88 +++++++++++++++++++++++++++++++++++++++++--
 1 files changed, 83 insertions(+), 5 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 9ef0804..c7b13bf 100644
--- a/src/main/java/cc/mrbird/febs/mall/controller/AdminMallMemberController.java
+++ b/src/main/java/cc/mrbird/febs/mall/controller/AdminMallMemberController.java
@@ -4,17 +4,16 @@
 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.*;
 import cc.mrbird.febs.mall.entity.MallMember;
 import cc.mrbird.febs.mall.entity.MallOrderRefund;
 import cc.mrbird.febs.mall.service.IAdminMallMemberService;
 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.Map;
 
@@ -69,11 +68,90 @@
         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);
     }
 
+    /**
+     * 资金流水-列表
+     * @param moneyFlowListDto
+     * @param request
+     * @return
+     */
+    @GetMapping("getMoneyFlowList")
+    public FebsResponse getMoneyFlowList(MoneyFlowListDto moneyFlowListDto, QueryRequest request) {
+        Map<String, Object> data = getDataTable(mallMemberService.getMoneyFlowListInPage(moneyFlowListDto, request));
+        return new FebsResponse().success().data(data);
+    }
+
+    /**
+     * 会员提现-列表
+     * @param moneyChargeListDto
+     * @param request
+     * @return
+     */
+    @GetMapping("getMoneyChargeList")
+    public FebsResponse getMoneyChargeList(MoneyChargeListDto moneyChargeListDto, QueryRequest request) {
+        Map<String, Object> data = getDataTable(mallMemberService.getMoneyChargeListInPage(moneyChargeListDto, request));
+        return new FebsResponse().success().data(data);
+    }
+
+    /**
+     * 会员提现-同意
+     * @param id
+     * @return
+     */
+    @GetMapping("chargeAgree/{id}")
+    @ControllerEndpoint(operation = "会员提现-同意", exceptionMessage = "操作失败")
+    public FebsResponse chargeAgree(@NotNull(message = "{required}") @PathVariable Long id) {
+        return mallMemberService.chargeAgree(id);
+    }
+
+    /**
+     * 会员提现-拒绝
+     * @param id
+     * @return
+     */
+    @GetMapping("chargeDisagree/{id}")
+    @ControllerEndpoint(operation = "会员提现-拒绝", exceptionMessage = "操作失败")
+    public FebsResponse chargeDisagree(@NotNull(message = "{required}") @PathVariable Long id) {
+        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);
+    }
+
 
 
 }

--
Gitblit v1.9.1