From 113f3a5d3b843fba68ce50a3ba3255c66ca1e15f Mon Sep 17 00:00:00 2001
From: xiaoyong931011 <15274802129@163.com>
Date: Tue, 17 Jan 2023 20:13:57 +0800
Subject: [PATCH] 20221227 充值归集

---
 src/main/java/cc/mrbird/febs/mall/controller/ViewMallMemberController.java |   98 ++++++++++++++++++++++++++++++-------------------
 1 files changed, 60 insertions(+), 38 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 8acf032..b42aedd 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");
     }
 
     /**
@@ -166,6 +188,18 @@
     public String agentAllMember(@PathVariable long id, Model model) {
         idFromAgentAllMember = id;
         return FebsUtil.view("modules/mallMember/agentAllMember");
+    }
+
+    /**
+     * 代理级别-全部成员
+     * @param id
+     * @param model
+     * @return
+     */
+    @GetMapping("agentAllMemberS/{id}")
+    public String agentAllMemberS(@PathVariable long id, Model model) {
+        idFromAgentAllMember = id;
+        return FebsUtil.view("modules/mallMember/agentAllMemberS");
     }
 
     /**
@@ -240,41 +274,6 @@
         return FebsUtil.view("modules/mallMember/appVerSionUpdate");
     }
 
-    /**
-     * 新闻中心-列表
-     * @return
-     */
-    @GetMapping("newsInfoList")
-    @RequiresPermissions("newsInfoList:view")
-    public String newsInfoList() {
-        return FebsUtil.view("modules/mallMember/newsInfoList");
-    }
-
-    /**
-     * 新闻中心-新增
-     * @return
-     */
-    @GetMapping("newsInfoAdd")
-    @RequiresPermissions("newsInfoAdd:add")
-    public String newsInfoAdd() {
-        return FebsUtil.view("modules/mallMember/newsInfoAdd");
-    }
-
-    /**
-     * 新闻中心-详情
-     * @param id
-     * @param model
-     * @return
-     */
-    @GetMapping("newsInfoUpdate/{id}")
-    @RequiresPermissions("newsInfoUpdate:update")
-    public String newsInfoUpdate(@PathVariable long id, Model model) {
-        MallNewsInfo data = mallMemberService.getNewsInfoById(id);
-        model.addAttribute("newsInfo", data);
-        return FebsUtil.view("modules/mallMember/newsInfoUpdate");
-    }
-
-
 
     @GetMapping("shopApply")
     public String shopApply() {
@@ -288,6 +287,29 @@
         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");
+    }
+
+    /**
+     * 充值列表
+     * @return
+     */
+    @GetMapping("memberCharge")
+    @RequiresPermissions("memberCharge:view")
+    public String memberCharge() {
+        return FebsUtil.view("modules/mallMember/memberCharge");
+    }
+
 
 
 

--
Gitblit v1.9.1