From c99b2aad164da7ce15536b716854da9ae46780ae Mon Sep 17 00:00:00 2001
From: Helius <wangdoubleone@gmail.com>
Date: Tue, 28 Sep 2021 10:51:32 +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 | 98 ++++++++++++++++++++++++++++++++++++++++++++++++-
1 files changed, 96 insertions(+), 2 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 cab9dc3..62dc4d1 100644
--- a/src/main/java/cc/mrbird/febs/mall/controller/ViewMallMemberController.java
+++ b/src/main/java/cc/mrbird/febs/mall/controller/ViewMallMemberController.java
@@ -3,10 +3,10 @@
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.service.IAdminMallMemberService;
-import cc.mrbird.febs.mall.vo.AdminMallMemberPaymentVo;
-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;
@@ -23,6 +23,8 @@
private final IAdminMallMemberService mallMemberService;
public static long idFromMoneyFlow;
+
+ public static long idFromAgentAllMember;
/**
* 会员列表
@@ -104,7 +106,99 @@
return FebsUtil.view("modules/mallMember/agentList");
}
+ /**
+ * 代理级别-列表
+ * @return
+ */
+ @GetMapping("agentLevelList")
+ @RequiresPermissions("agentLevelList:view")
+ public String agentLevelList() {
+ return FebsUtil.view("modules/mallMember/agentLevelList");
+ }
+ /**
+ * 代理级别-详情
+ * @param id
+ * @param model
+ * @return
+ */
+ @GetMapping("agentLevelUpdate/{id}")
+ @RequiresPermissions("agentLevelUpdate:update")
+ public String agentLevelUpdate(@PathVariable long id, Model model) {
+ AdminAgentLevelUpdateInfoVo data = mallMemberService.getAgentLevelUpdateInfoById(id);
+ model.addAttribute("agentLevelUpdateInfo", data);
+ 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");
+ }
+
+ /**
+ * 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");
+ }
--
Gitblit v1.9.1