From c619972c50577bb699be6ee099b5e2741882fabb Mon Sep 17 00:00:00 2001
From: KKSU <15274802129@163.com>
Date: Wed, 27 Dec 2023 16:15:59 +0800
Subject: [PATCH] 直推奖励，冻结的用户，则直推奖励销毁，用户未冻结才能领取成功

---
 src/main/java/cc/mrbird/febs/mall/controller/ViewMallMemberController.java |   81 +++++++++++++++++++++++-----------------
 1 files changed, 47 insertions(+), 34 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 39cddb8..ef7b482 100644
--- a/src/main/java/cc/mrbird/febs/mall/controller/ViewMallMemberController.java
+++ b/src/main/java/cc/mrbird/febs/mall/controller/ViewMallMemberController.java
@@ -6,6 +6,7 @@
 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;
@@ -26,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");
+    }
 
     /**
      * 会员列表
@@ -57,11 +68,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");
     }
 
@@ -158,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
      */
@@ -215,44 +241,31 @@
         return FebsUtil.view("modules/mallMember/appVerSionUpdate");
     }
 
-    /**
-     * 新闻中心-列表
-     * @return
-     */
-    @GetMapping("newsInfoList")
-    @RequiresPermissions("newsInfoList:view")
-    public String newsInfoList() {
-        return FebsUtil.view("modules/mallMember/newsInfoList");
+
+    @GetMapping("shopApply")
+    public String shopApply() {
+        return FebsUtil.view("modules/mallMember/shopApply");
     }
 
-    /**
-     * 新闻中心-新增
-     * @return
-     */
-    @GetMapping("newsInfoAdd")
-    @RequiresPermissions("newsInfoAdd:add")
-    public String newsInfoAdd() {
-        return FebsUtil.view("modules/mallMember/newsInfoAdd");
+    @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");
     }
 
-    /**
-     * 新闻中心-详情
-     * @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("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