From 0a54c5df5c1a1f77570a07ff008ed90ff9d17da4 Mon Sep 17 00:00:00 2001
From: Helius <wangdoubleone@gmail.com>
Date: Mon, 27 Sep 2021 15:51:29 +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 | 25 +++++++++++++++++++++++++
1 files changed, 25 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 22a51df..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;
@@ -143,6 +144,30 @@
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