From 2951c68cea68f6c0eab405fa5fec7b1d18665ac9 Mon Sep 17 00:00:00 2001
From: xiaoyong931011 <15274802129@163.com>
Date: Fri, 24 Sep 2021 19:06:53 +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 | 17 +++++++++++++++++
1 files changed, 17 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 aee034e..9ef0804 100644
--- a/src/main/java/cc/mrbird/febs/mall/controller/AdminMallMemberController.java
+++ b/src/main/java/cc/mrbird/febs/mall/controller/AdminMallMemberController.java
@@ -5,6 +5,7 @@
import cc.mrbird.febs.common.entity.FebsResponse;
import cc.mrbird.febs.common.entity.QueryRequest;
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;
@@ -59,4 +60,20 @@
public FebsResponse openAccount(@NotNull(message = "{required}") @PathVariable Long id) {
return mallMemberService.openAccount(id);
}
+
+ /**
+ * 会员列表-资金流水
+ */
+ @GetMapping("/moneyFlow")
+ public FebsResponse moneyFlow(QueryRequest request, MallMember mallMember, Integer parentId) {
+ if(parentId==null){
+ ViewMallMemberController.idFromMoneyFlow=0;
+ }
+ mallMember.setId(ViewMallOrderController.idFromRefund);
+ Map<String, Object> dataTable = getDataTable(mallMemberService.moneyFlow(request, mallMember));
+ return new FebsResponse().success().data(dataTable);
+ }
+
+
+
}
--
Gitblit v1.9.1