From a7962f680b606fbd200550bfda679f0957f3c447 Mon Sep 17 00:00:00 2001
From: xiaoyong931011 <15274802129@163.com>
Date: Mon, 27 Sep 2021 15:44:12 +0800
Subject: [PATCH] Merge branch 'master' of http://120.27.238.55:7000/r/xc-mall
---
src/main/java/cc/mrbird/febs/mall/controller/ViewMallMemberController.java | 39 +++++++++++++++++++++++++++++++++++++++
1 files changed, 39 insertions(+), 0 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 2b3ed41..5cae191 100644
--- a/src/main/java/cc/mrbird/febs/mall/controller/ViewMallMemberController.java
+++ b/src/main/java/cc/mrbird/febs/mall/controller/ViewMallMemberController.java
@@ -7,6 +7,7 @@
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 lombok.RequiredArgsConstructor;
import org.apache.shiro.authz.annotation.RequiresPermissions;
@@ -24,6 +25,8 @@
private final IAdminMallMemberService mallMemberService;
public static long idFromMoneyFlow;
+
+ public static long idFromAgentAllMember;
/**
* 会员列表
@@ -129,6 +132,42 @@
return FebsUtil.view("modules/mallMember/agentLevelUpdate");
}
+ /**
+ * 代理级别-全部成员
+ * @param id
+ * @param model
+ * @return
+ */
+ @GetMapping("agentAllMember/{id}")
+ public String agentAllMember(@PathVariable long id, Model model) {
+ idFromAgentAllMember = id;
+ return FebsUtil.view("modules/mallMember/agentAllMember");
+ }
+
+ /**
+ * 奖励设置-列表
+ * @return
+ */
+ @GetMapping("rankAwardList")
+ @RequiresPermissions("rankAwardList:view")
+ public String rankAwardList() {
+ return FebsUtil.view("modules/mallMember/rankAwardList");
+ }
+
+ /**
+ * 奖励设置-详情
+ * @param id
+ * @param model
+ * @return
+ */
+ @GetMapping("rankAwardUpdate/{id}")
+ @RequiresPermissions("rankAwardUpdate:update")
+ public String rankAwardUpdate(@PathVariable long id, Model model) {
+ AdminRankAwardUpdateInfoVo data = mallMemberService.getRankAwardUpdateInfoById(id);
+ model.addAttribute("rankAwardUpdateInfo", data);
+ return FebsUtil.view("modules/mallMember/rankAwardUpdate");
+ }
+
--
Gitblit v1.9.1