From 7ecd2c9bb7b1a77fd2d55a59b2ce85c9ddb26ee7 Mon Sep 17 00:00:00 2001
From: xiaoyong931011 <15274802129@163.com>
Date: Fri, 13 Oct 2023 11:11:06 +0800
Subject: [PATCH] redbagprod

---
 src/main/java/cc/mrbird/febs/mall/controller/ViewMallMemberController.java |   57 +++++++++++++++++++++++++++++++++++++++++++++++++++++----
 1 files changed, 53 insertions(+), 4 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 057d595..462e762 100644
--- a/src/main/java/cc/mrbird/febs/mall/controller/ViewMallMemberController.java
+++ b/src/main/java/cc/mrbird/febs/mall/controller/ViewMallMemberController.java
@@ -49,6 +49,16 @@
     }
 
     /**
+     * 会员列表
+     * @return
+     */
+    @GetMapping("mallMemberListS")
+    @RequiresPermissions("mallMemberListS:view")
+    public String mallMemberListS() {
+        return FebsUtil.view("modules/mallMember/mallMemberListS");
+    }
+
+    /**
      * 会员列表-个人详情
      * @param id
      * @param model
@@ -68,11 +78,12 @@
      * @param model
      * @return
      */
-    @GetMapping("mallSystemPay/{id}")
+    @GetMapping("mallSystemPay/{type}/{id}")
     @RequiresPermissions("mallSystemPay:update")
-    public String systemPay(@PathVariable long id, Model model) {
+    public String systemPay(@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/mallSystemPay");
     }
 
@@ -117,7 +128,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");
     }
@@ -130,6 +142,16 @@
     @RequiresPermissions("agentList:view")
     public String agentList() {
         return FebsUtil.view("modules/mallMember/agentList");
+    }
+
+    /**
+     * 代理列表
+     * @return
+     */
+    @GetMapping("agentListS")
+    @RequiresPermissions("agentListS:view")
+    public String agentListS() {
+        return FebsUtil.view("modules/mallMember/agentListS");
     }
 
     /**
@@ -169,6 +191,18 @@
     }
 
     /**
+     * 代理级别-全部成员
+     * @param id
+     * @param model
+     * @return
+     */
+    @GetMapping("agentAllMemberS/{id}")
+    public String agentAllMemberS(@PathVariable long id, Model model) {
+        idFromAgentAllMember = id;
+        return FebsUtil.view("modules/mallMember/agentAllMemberS");
+    }
+
+    /**
      * 代理级别-设置代理
      * @param id
      * @param model
@@ -177,7 +211,9 @@
     @GetMapping("agentLevelSet/{id}")
     @RequiresPermissions("agentLevelSet:update")
     public String agentLevelSet(@PathVariable long id, Model model) {
-        AdminAgentLevelSetInfoVo data = mallMemberService.getAgentLevelSetInfoByMemberId(id);
+//        AdminAgentLevelSetInfoVo data = mallMemberService.getAgentLevelSetInfoByMemberId(id);
+        AdminAgentLevelSetInfoVo data = new AdminAgentLevelSetInfoVo();
+        data.setId(id);
         model.addAttribute("agentLevelSet", data);
         return FebsUtil.view("modules/mallMember/agentLevelSet");
     }
@@ -253,6 +289,19 @@
         return FebsUtil.view("modules/mallMember/shopApplyInfo");
     }
 
+    @GetMapping("updateReferer/{id}")
+    public String updateReferer(@PathVariable("id") Long id, Model model) {
+        MallMember member = mallMemberService.getById(id);
+        model.addAttribute("referer", mallMemberService.findByInviteId(member.getReferrerId()));
+        model.addAttribute("id", id);
+        return FebsUtil.view("modules/mallMember/updateRefererId");
+    }
+
+    @GetMapping("addMember")
+    public String addMember() {
+        return FebsUtil.view("modules/mallMember/addMember");
+    }
+
 
 
 

--
Gitblit v1.9.1