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 |  107 +++++++++++++++++++++++++++++++++++++++++++++++++++++
 1 files changed, 106 insertions(+), 1 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 62dc4d1..b42aedd 100644
--- a/src/main/java/cc/mrbird/febs/mall/controller/ViewMallMemberController.java
+++ b/src/main/java/cc/mrbird/febs/mall/controller/ViewMallMemberController.java
@@ -5,6 +5,8 @@
 import cc.mrbird.febs.common.utils.FebsUtil;
 import cc.mrbird.febs.mall.entity.AppVersion;
 import cc.mrbird.febs.mall.entity.MallMember;
+import cc.mrbird.febs.mall.entity.MallNewsInfo;
+import cc.mrbird.febs.mall.entity.MallShopApply;
 import cc.mrbird.febs.mall.service.IAdminMallMemberService;
 import cc.mrbird.febs.mall.vo.*;
 import lombok.RequiredArgsConstructor;
@@ -27,6 +29,16 @@
     public static long idFromAgentAllMember;
 
     /**
+     * 平台账单
+     * @return
+     */
+    @GetMapping("mallDataList")
+    @RequiresPermissions("mallDataList:view")
+    public String mallDataList() {
+        return FebsUtil.view("modules/mallMember/mallDataList");
+    }
+
+    /**
      * 会员列表
      * @return
      */
@@ -34,6 +46,16 @@
     @RequiresPermissions("mallMemberList:view")
     public String mallMember() {
         return FebsUtil.view("modules/mallMember/mallMemberList");
+    }
+
+    /**
+     * 会员列表
+     * @return
+     */
+    @GetMapping("mallMemberListS")
+    @RequiresPermissions("mallMemberListS:view")
+    public String mallMemberListS() {
+        return FebsUtil.view("modules/mallMember/mallMemberListS");
     }
 
     /**
@@ -48,6 +70,21 @@
         MallMemberVo data = mallMemberService.getMallMemberInfoById(id);
         model.addAttribute("member", data);
         return FebsUtil.view("modules/mallMember/detail");
+    }
+
+    /**
+     * 会员列表-系统拨付
+     * @param id
+     * @param model
+     * @return
+     */
+    @GetMapping("mallSystemPay/{type}/{id}")
+    @RequiresPermissions("mallSystemPay:update")
+    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");
     }
 
     /**
@@ -91,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");
     }
@@ -104,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");
     }
 
     /**
@@ -140,6 +188,32 @@
     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");
+    }
+
+    /**
+     * 代理级别-设置代理
+     * @param id
+     * @param model
+     * @return
+     */
+    @GetMapping("agentLevelSet/{id}")
+    @RequiresPermissions("agentLevelSet:update")
+    public String agentLevelSet(@PathVariable long id, Model model) {
+        AdminAgentLevelSetInfoVo data = mallMemberService.getAgentLevelSetInfoByMemberId(id);
+        model.addAttribute("agentLevelSet", data);
+        return FebsUtil.view("modules/mallMember/agentLevelSet");
     }
 
     /**
@@ -201,9 +275,40 @@
     }
 
 
+    @GetMapping("shopApply")
+    public String shopApply() {
+        return FebsUtil.view("modules/mallMember/shopApply");
+    }
 
+    @GetMapping("applyDetail/{id}")
+    public String applyDetail(@PathVariable("id") Long id, Model model) {
+        MallShopApply apply = mallMemberService.findShopApplyById(id);
+        model.addAttribute("apply", apply);
+        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