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/ViewMallMemberController.java |  117 +++++++++++++++++++++++++++++++++++++++++++++++++++++++++-
 1 files changed, 115 insertions(+), 2 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 c0e4c32..2b3ed41 100644
--- a/src/main/java/cc/mrbird/febs/mall/controller/ViewMallMemberController.java
+++ b/src/main/java/cc/mrbird/febs/mall/controller/ViewMallMemberController.java
@@ -3,10 +3,17 @@
 import cc.mrbird.febs.common.controller.BaseController;
 import cc.mrbird.febs.common.entity.FebsConstant;
 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.MallMemberVo;
 import lombok.RequiredArgsConstructor;
 import org.apache.shiro.authz.annotation.RequiresPermissions;
 import org.springframework.stereotype.Controller;
+import org.springframework.ui.Model;
 import org.springframework.web.bind.annotation.GetMapping;
+import org.springframework.web.bind.annotation.PathVariable;
 import org.springframework.web.bind.annotation.RequestMapping;
 
 @Controller("mallMemberView")
@@ -14,14 +21,120 @@
 @RequiredArgsConstructor
 public class ViewMallMemberController extends BaseController {
 
+    private final IAdminMallMemberService mallMemberService;
+
+    public static long idFromMoneyFlow;
+
     /**
      * 会员列表
      * @return
      */
-    @GetMapping("mallMember")
-    @RequiresPermissions("mallMember:view")
+    @GetMapping("mallMemberList")
+    @RequiresPermissions("mallMemberList:view")
     public String mallMember() {
         return FebsUtil.view("modules/mallMember/mallMemberList");
     }
 
+    /**
+     * 会员列表-个人详情
+     * @param id
+     * @param model
+     * @return
+     */
+    @GetMapping("detail/{id}")
+    @RequiresPermissions("detail:update")
+    public String detail(@PathVariable long id, Model model) {
+        MallMemberVo data = mallMemberService.getMallMemberInfoById(id);
+        model.addAttribute("member", data);
+        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");
+    }
+
+
+
+
+
+
+
+
+
 }

--
Gitblit v1.9.1