From 5ebe08326ec43936d127bf704f3853adaf7b01c9 Mon Sep 17 00:00:00 2001
From: xiaoyong931011 <15274802129@163.com>
Date: Mon, 27 Sep 2021 11:28:54 +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 | 37 +++++++++++++++++++++++++++++++++++++
1 files changed, 37 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 cab9dc3..22a51df 100644
--- a/src/main/java/cc/mrbird/febs/mall/controller/ViewMallMemberController.java
+++ b/src/main/java/cc/mrbird/febs/mall/controller/ViewMallMemberController.java
@@ -5,6 +5,7 @@
import cc.mrbird.febs.common.utils.FebsUtil;
import cc.mrbird.febs.mall.entity.MallMember;
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.MallMemberVo;
import lombok.RequiredArgsConstructor;
@@ -23,6 +24,8 @@
private final IAdminMallMemberService mallMemberService;
public static long idFromMoneyFlow;
+
+ public static long idFromAgentAllMember;
/**
* 会员列表
@@ -104,7 +107,41 @@
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");
+ }
--
Gitblit v1.9.1