From 01912c5b68a2b5bec7a99d7c3ec78190dd49f0e1 Mon Sep 17 00:00:00 2001
From: Helius <wangdoubleone@gmail.com>
Date: Tue, 10 May 2022 18:24:32 +0800
Subject: [PATCH] fix

---
 src/main/java/cc/mrbird/febs/mall/controller/ViewMallMemberController.java |  113 ++++++++++++++++++++++++++++++++++++++++++++++++++++++--
 1 files changed, 109 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 5cae191..87418ec 100644
--- a/src/main/java/cc/mrbird/febs/mall/controller/ViewMallMemberController.java
+++ b/src/main/java/cc/mrbird/febs/mall/controller/ViewMallMemberController.java
@@ -3,12 +3,11 @@
 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.AppVersion;
 import cc.mrbird.febs.mall.entity.MallMember;
+import cc.mrbird.febs.mall.entity.MallNewsInfo;
 import cc.mrbird.febs.mall.service.IAdminMallMemberService;
-import cc.mrbird.febs.mall.vo.AdminAgentLevelUpdateInfoVo;
-import cc.mrbird.febs.mall.vo.AdminMallMemberPaymentVo;
-import cc.mrbird.febs.mall.vo.AdminRankAwardUpdateInfoVo;
-import cc.mrbird.febs.mall.vo.MallMemberVo;
+import cc.mrbird.febs.mall.vo.*;
 import lombok.RequiredArgsConstructor;
 import org.apache.shiro.authz.annotation.RequiresPermissions;
 import org.springframework.stereotype.Controller;
@@ -27,6 +26,16 @@
     public static long idFromMoneyFlow;
 
     public static long idFromAgentAllMember;
+
+    /**
+     * 平台账单
+     * @return
+     */
+    @GetMapping("mallDataList")
+    @RequiresPermissions("mallDataList:view")
+    public String mallDataList() {
+        return FebsUtil.view("modules/mallMember/mallDataList");
+    }
 
     /**
      * 会员列表
@@ -50,6 +59,20 @@
         MallMemberVo data = mallMemberService.getMallMemberInfoById(id);
         model.addAttribute("member", data);
         return FebsUtil.view("modules/mallMember/detail");
+    }
+
+    /**
+     * 会员列表-系统拨付
+     * @param id
+     * @param model
+     * @return
+     */
+    @GetMapping("mallSystemPay/{id}")
+    @RequiresPermissions("mallSystemPay:update")
+    public String systemPay(@PathVariable long id, Model model) {
+        MallMemberVo data = mallMemberService.getMallMemberInfoById(id);
+        model.addAttribute("systemPay", data);
+        return FebsUtil.view("modules/mallMember/mallSystemPay");
     }
 
     /**
@@ -145,6 +168,20 @@
     }
 
     /**
+     * 代理级别-设置代理
+     * @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");
+    }
+
+    /**
      * 奖励设置-列表
      * @return
      */
@@ -168,6 +205,74 @@
         return FebsUtil.view("modules/mallMember/rankAwardUpdate");
     }
 
+    /**
+     * App版本-列表
+     * @return
+     */
+    @GetMapping("appVersionList")
+    @RequiresPermissions("appVersionList:view")
+    public String appVersionList() {
+        return FebsUtil.view("modules/mallMember/appVersionList");
+    }
+
+    /**
+     * App版本-新增
+     * @return
+     */
+    @GetMapping("appVersionAdd")
+    @RequiresPermissions("appVersionAdd:add")
+    public String appVersionAdd() {
+        return FebsUtil.view("modules/mallMember/appVersionAdd");
+    }
+
+    /**
+     * App版本-详情
+     * @param id
+     * @param model
+     * @return
+     */
+    @GetMapping("appVerSionUpdate/{id}")
+    @RequiresPermissions("appVerSionUpdate:update")
+    public String appVerSionUpdate(@PathVariable long id, Model model) {
+        AppVersion data = mallMemberService.getAppVersionInfoById(id);
+        model.addAttribute("appVersion", data);
+        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");
+    }
+
 
 
 

--
Gitblit v1.9.1