From f2e8d9c23748ce7bd19a355098d97860d454401e Mon Sep 17 00:00:00 2001
From: Helius <wangdoubleone@gmail.com>
Date: Sun, 26 Sep 2021 20:35:14 +0800
Subject: [PATCH] add return money
---
src/main/java/cc/mrbird/febs/mall/controller/AdminMallMemberController.java | 15 ++++++++++++++-
1 files changed, 14 insertions(+), 1 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..e907f35 100644
--- a/src/main/java/cc/mrbird/febs/mall/controller/AdminMallMemberController.java
+++ b/src/main/java/cc/mrbird/febs/mall/controller/AdminMallMemberController.java
@@ -4,6 +4,7 @@
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.AgentDto;
import cc.mrbird.febs.mall.dto.MoneyChargeListDto;
import cc.mrbird.febs.mall.dto.MoneyFlowListDto;
import cc.mrbird.febs.mall.entity.MallMember;
@@ -71,7 +72,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 +123,18 @@
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);
+ }
+
}
--
Gitblit v1.9.1