From 1d41d6579bd3d10c5ed3d702d1ce4de10aab74dd Mon Sep 17 00:00:00 2001
From: Helius <wangdoubleone@gmail.com>
Date: Thu, 16 Jun 2022 11:08:19 +0800
Subject: [PATCH] fix

---
 src/main/java/cc/mrbird/febs/mall/controller/ViewMallMemberController.java |  102 +++++++++++++++++++++++++++++++++++++++++++++++++--
 1 files changed, 98 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..ef7b482 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,12 @@
 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.entity.MallShopApply;
 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 +27,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 +60,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");
     }
 
     /**
@@ -145,6 +170,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,10 +207,65 @@
         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");
+    }
 
 
+    @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");
+    }
 
 
 

--
Gitblit v1.9.1