From eafe68cf77bee466b7cea122784f784e694fef53 Mon Sep 17 00:00:00 2001
From: Hentua <wangdoubleone@gmail.com>
Date: Thu, 15 Jun 2023 09:01:41 +0800
Subject: [PATCH] “1

---
 src/main/java/cc/mrbird/febs/mall/controller/ViewMallMemberController.java |   94 ++++++++++++++++++++++++++++++++++++++++++++++-
 1 files changed, 92 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 60e077e..6f84b70 100644
--- a/src/main/java/cc/mrbird/febs/mall/controller/ViewMallMemberController.java
+++ b/src/main/java/cc/mrbird/febs/mall/controller/ViewMallMemberController.java
@@ -16,6 +16,9 @@
 import org.springframework.web.bind.annotation.GetMapping;
 import org.springframework.web.bind.annotation.PathVariable;
 import org.springframework.web.bind.annotation.RequestMapping;
+import org.springframework.web.bind.annotation.RequestParam;
+
+import javax.servlet.http.HttpServletRequest;
 
 @Controller("mallMemberView")
 @RequestMapping(FebsConstant.VIEW_PREFIX + "modules/mallMember")
@@ -27,6 +30,10 @@
     public static long idFromMoneyFlow;
 
     public static long idFromAgentAllMember;
+
+    public static long idFromScoreRoleRelease;
+
+    public static long idFromScoreAchieveRelease;
 
     /**
      * 平台账单
@@ -88,12 +95,28 @@
     }
 
     /**
+     * 会员列表-系统拨付绿色凭证
+     * @param id
+     * @param model
+     * @return
+     */
+    @GetMapping("voucherUpdate/{type}/{id}")
+    @RequiresPermissions("voucherUpdate:update")
+    public String voucherUpdate(@PathVariable long id, @PathVariable Integer type, Model model) {
+        MallMemberVo data = mallMemberService.getMallMemberInfoById(id);
+        model.addAttribute("systemPay", data);
+        model.addAttribute("type", type);
+        return FebsUtil.view("modules/mallMember/voucherUpdate");
+    }
+
+    /**
      * 会员列表-资金流水
      * @param id
      * @param model
      * @return
      */
     @GetMapping("moneyFlow/{id}")
+    @RequiresPermissions("moneyFlow:update")
     public String moneyFlow(@PathVariable long id, Model model) {
         idFromMoneyFlow = id;
         return FebsUtil.view("modules/mallMember/moneyFlow");
@@ -105,7 +128,9 @@
      */
     @GetMapping("moneyFlowList")
     @RequiresPermissions("moneyFlowList:view")
-    public String moneyFlowList() {
+    public String moneyFlowList(String refererId, String inviteId, Model model) {
+        model.addAttribute("referrerId", refererId);
+        model.addAttribute("inviteId", inviteId);
         return FebsUtil.view("modules/mallMember/moneyFlowList");
     }
 
@@ -128,7 +153,8 @@
     @GetMapping("paymentInfo/{id}")
     @RequiresPermissions("paymentInfo:update")
     public String paymentInfo(@PathVariable long id, Model model) {
-        AdminMallMemberPaymentVo data = mallMemberService.getMallMemberPaymentInfoByFlowId(id);
+//        AdminMallMemberPaymentVo data = mallMemberService.getMallMemberPaymentInfoByFlowId(id);
+        AdminMallMemberPaymentVo data = mallMemberService.getMallBankInfoById(id);
         model.addAttribute("paymentInfo", data);
         return FebsUtil.view("modules/mallMember/paymentInfo");
     }
@@ -287,6 +313,7 @@
     }
 
     @GetMapping("updateReferer/{id}")
+    @RequiresPermissions("updateReferer:update")
     public String updateReferer(@PathVariable("id") Long id, Model model) {
         MallMember member = mallMemberService.getById(id);
         model.addAttribute("referer", mallMemberService.findByInviteId(member.getReferrerId()));
@@ -295,11 +322,74 @@
     }
 
     @GetMapping("addMember")
+    @RequiresPermissions("addMember:update")
     public String addMember() {
         return FebsUtil.view("modules/mallMember/addMember");
     }
 
 
+    /**
+     * 创世释放记录-列表
+     * @return
+     */
+    @GetMapping("scoreRoleRelease")
+    @RequiresPermissions("scoreRoleRelease:view")
+    public String scoreRoleRelease() {
+        return FebsUtil.view("modules/mallMember/scoreRoleRelease");
+    }
+
+    /**
+     * 创世释放记录-全部记录
+     * @param id
+     * @param model
+     * @return
+     */
+    @GetMapping("scoreRoleReleaseList/{id}")
+    public String scoreRoleReleaseList(@PathVariable long id, Model model) {
+        idFromScoreRoleRelease = id;
+        return FebsUtil.view("modules/mallMember/scoreRoleReleaseList");
+    }
+
+
+    /**
+     * 业绩释放记录-列表
+     * @return
+     */
+    @GetMapping("scoreAchieveRelease")
+    @RequiresPermissions("scoreAchieveRelease:view")
+    public String scoreAchieveRelease() {
+        return FebsUtil.view("modules/mallMember/scoreAchieveRelease");
+    }
+
+    /**
+     * 业绩释放记录-全部记录
+     * @param id
+     * @param model
+     * @return
+     */
+    @GetMapping("scoreAchieveReleaseList/{id}")
+    public String scoreAchieveReleaseList(@PathVariable long id, Model model) {
+        idFromScoreAchieveRelease = id;
+        return FebsUtil.view("modules/mallMember/scoreAchieveReleaseList");
+    }
+
+
+    @GetMapping("matrixTree")
+    public String matrixTree() {
+        return FebsUtil.view("modules/mallMember/matrixTree");
+    }
+
+    @GetMapping("teamList")
+    public String teamList() {
+        return FebsUtil.view("modules/mallMember/teamList");
+    }
+
+    @GetMapping("teamList/{type}/{inviteId}")
+    public String teamListByInviteId(@PathVariable(value = "inviteId") String inviteId, @PathVariable("type") Integer type, Model model) {
+        model.addAttribute("refererId", inviteId);
+        model.addAttribute("type", type);
+        return FebsUtil.view("modules/mallMember/teamList");
+    }
 
 
 }

--
Gitblit v1.9.1