From c8df15c5d52874b0cb1b53e27091ce1cc4cd6634 Mon Sep 17 00:00:00 2001
From: Helius <wangdoubleone@gmail.com>
Date: Sat, 25 Sep 2021 10:51:32 +0800
Subject: [PATCH] add overtime job

---
 src/main/java/cc/mrbird/febs/mall/controller/ViewMallMemberController.java |   49 +++++++++++++++++++++++++++++++++++++++++++++++--
 1 files changed, 47 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..9057754 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,15 @@
 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.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 +19,54 @@
 @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");
+    }
+
+
+
+
+
+
+
+
+
+
+
 }

--
Gitblit v1.9.1