From a7962f680b606fbd200550bfda679f0957f3c447 Mon Sep 17 00:00:00 2001
From: xiaoyong931011 <15274802129@163.com>
Date: Mon, 27 Sep 2021 15:44:12 +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 |  131 +++++++++++++++++++++++++++++++++++++++++++
 1 files changed, 131 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 4faee7f..5cae191 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,9 @@
 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.AdminAgentLevelUpdateInfoVo;
+import cc.mrbird.febs.mall.vo.AdminMallMemberPaymentVo;
+import cc.mrbird.febs.mall.vo.AdminRankAwardUpdateInfoVo;
 import cc.mrbird.febs.mall.vo.MallMemberVo;
 import lombok.RequiredArgsConstructor;
 import org.apache.shiro.authz.annotation.RequiresPermissions;
@@ -20,6 +23,10 @@
 public class ViewMallMemberController extends BaseController {
 
     private final IAdminMallMemberService mallMemberService;
+
+    public static long idFromMoneyFlow;
+
+    public static long idFromAgentAllMember;
 
     /**
      * 会员列表
@@ -45,4 +52,128 @@
         return FebsUtil.view("modules/mallMember/detail");
     }
 
+    /**
+     * 会员列表-资金流水
+     * @param id
+     * @param model
+     * @return
+     */
+    @GetMapping("moneyFlow/{id}")
+    public String moneyFlow(@PathVariable long id, Model model) {
+        idFromMoneyFlow = id;
+        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");
+    }
+
+    /**
+     * 代理级别-列表
+     * @return
+     */
+    @GetMapping("agentLevelList")
+    @RequiresPermissions("agentLevelList:view")
+    public String agentLevelList() {
+        return FebsUtil.view("modules/mallMember/agentLevelList");
+    }
+
+    /**
+     * 代理级别-详情
+     * @param id
+     * @param model
+     * @return
+     */
+    @GetMapping("agentLevelUpdate/{id}")
+    @RequiresPermissions("agentLevelUpdate:update")
+    public String agentLevelUpdate(@PathVariable long id, Model model) {
+        AdminAgentLevelUpdateInfoVo data = mallMemberService.getAgentLevelUpdateInfoById(id);
+        model.addAttribute("agentLevelUpdateInfo", data);
+        return FebsUtil.view("modules/mallMember/agentLevelUpdate");
+    }
+
+    /**
+     * 代理级别-全部成员
+     * @param id
+     * @param model
+     * @return
+     */
+    @GetMapping("agentAllMember/{id}")
+    public String agentAllMember(@PathVariable long id, Model model) {
+        idFromAgentAllMember = id;
+        return FebsUtil.view("modules/mallMember/agentAllMember");
+    }
+
+    /**
+     * 奖励设置-列表
+     * @return
+     */
+    @GetMapping("rankAwardList")
+    @RequiresPermissions("rankAwardList:view")
+    public String rankAwardList() {
+        return FebsUtil.view("modules/mallMember/rankAwardList");
+    }
+
+    /**
+     * 奖励设置-详情
+     * @param id
+     * @param model
+     * @return
+     */
+    @GetMapping("rankAwardUpdate/{id}")
+    @RequiresPermissions("rankAwardUpdate:update")
+    public String rankAwardUpdate(@PathVariable long id, Model model) {
+        AdminRankAwardUpdateInfoVo data = mallMemberService.getRankAwardUpdateInfoById(id);
+        model.addAttribute("rankAwardUpdateInfo", data);
+        return FebsUtil.view("modules/mallMember/rankAwardUpdate");
+    }
+
+
+
+
+
+
+
+
+
 }

--
Gitblit v1.9.1