From 3e4cfdd9da5ed748292e7da7ec42a64d0fe4b75c Mon Sep 17 00:00:00 2001
From: xiaoyong931011 <15274802129@163.com>
Date: Sun, 26 Sep 2021 19:00:46 +0800
Subject: [PATCH] Merge branch 'master' of http://120.27.238.55:7000/r/xc-mall
---
src/main/java/cc/mrbird/febs/mall/controller/ViewMallMemberController.java | 45 +++++++++++++++++++++++++++++++++++++++++++++
1 files changed, 45 insertions(+), 0 deletions(-)
diff --git a/src/main/java/cc/mrbird/febs/mall/controller/ViewMallMemberController.java b/src/main/java/cc/mrbird/febs/mall/controller/ViewMallMemberController.java
index 9057754..cab9dc3 100644
--- a/src/main/java/cc/mrbird/febs/mall/controller/ViewMallMemberController.java
+++ b/src/main/java/cc/mrbird/febs/mall/controller/ViewMallMemberController.java
@@ -5,6 +5,7 @@
import cc.mrbird.febs.common.utils.FebsUtil;
import cc.mrbird.febs.mall.entity.MallMember;
import cc.mrbird.febs.mall.service.IAdminMallMemberService;
+import cc.mrbird.febs.mall.vo.AdminMallMemberPaymentVo;
import cc.mrbird.febs.mall.vo.MallMemberVo;
import lombok.RequiredArgsConstructor;
import org.apache.shiro.authz.annotation.RequiresPermissions;
@@ -59,6 +60,50 @@
return FebsUtil.view("modules/mallMember/moneyFlow");
}
+ /**
+ * 资金流水列表
+ * @return
+ */
+ @GetMapping("moneyFlowList")
+ @RequiresPermissions("moneyFlowList:view")
+ public String moneyFlowList() {
+ return FebsUtil.view("modules/mallMember/moneyFlowList");
+ }
+
+ /**
+ * 提现列表
+ * @return
+ */
+ @GetMapping("chargeFlowList")
+ @RequiresPermissions("chargeFlowList:view")
+ public String chargeFlowList() {
+ return FebsUtil.view("modules/mallMember/chargeFlowList");
+ }
+
+ /**
+ * 提现列表-收款方式
+ * @param id
+ * @param model
+ * @return
+ */
+ @GetMapping("paymentInfo/{id}")
+ @RequiresPermissions("paymentInfo:update")
+ public String paymentInfo(@PathVariable long id, Model model) {
+ AdminMallMemberPaymentVo data = mallMemberService.getMallMemberPaymentInfoByFlowId(id);
+ model.addAttribute("paymentInfo", data);
+ return FebsUtil.view("modules/mallMember/paymentInfo");
+ }
+
+ /**
+ * 代理列表
+ * @return
+ */
+ @GetMapping("agentList")
+ @RequiresPermissions("agentList:view")
+ public String agentList() {
+ return FebsUtil.view("modules/mallMember/agentList");
+ }
+
--
Gitblit v1.9.1