From bad4cadc4c4bc735e97247918a0555bfc1278798 Mon Sep 17 00:00:00 2001
From: xiaoyong931011 <15274802129@163.com>
Date: Tue, 24 Oct 2023 17:19:08 +0800
Subject: [PATCH] 版本管理
---
src/main/java/cc/mrbird/febs/mall/controller/ViewMallMemberController.java | 39 +++++++++++++++++++++++++++++++++++++--
1 files changed, 37 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 ef7b482..462e762 100644
--- a/src/main/java/cc/mrbird/febs/mall/controller/ViewMallMemberController.java
+++ b/src/main/java/cc/mrbird/febs/mall/controller/ViewMallMemberController.java
@@ -49,6 +49,16 @@
}
/**
+ * 会员列表
+ * @return
+ */
+ @GetMapping("mallMemberListS")
+ @RequiresPermissions("mallMemberListS:view")
+ public String mallMemberListS() {
+ return FebsUtil.view("modules/mallMember/mallMemberListS");
+ }
+
+ /**
* 会员列表-个人详情
* @param id
* @param model
@@ -118,7 +128,8 @@
@GetMapping("paymentInfo/{id}")
@RequiresPermissions("paymentInfo:update")
public String paymentInfo(@PathVariable long id, Model model) {
- AdminMallMemberPaymentVo data = mallMemberService.getMallMemberPaymentInfoByFlowId(id);
+// AdminMallMemberPaymentVo data = mallMemberService.getMallMemberPaymentInfoByFlowId(id);
+ AdminMallMemberPaymentVo data = mallMemberService.getMallBankInfoById(id);
model.addAttribute("paymentInfo", data);
return FebsUtil.view("modules/mallMember/paymentInfo");
}
@@ -131,6 +142,16 @@
@RequiresPermissions("agentList:view")
public String agentList() {
return FebsUtil.view("modules/mallMember/agentList");
+ }
+
+ /**
+ * 代理列表
+ * @return
+ */
+ @GetMapping("agentListS")
+ @RequiresPermissions("agentListS:view")
+ public String agentListS() {
+ return FebsUtil.view("modules/mallMember/agentListS");
}
/**
@@ -170,6 +191,18 @@
}
/**
+ * 代理级别-全部成员
+ * @param id
+ * @param model
+ * @return
+ */
+ @GetMapping("agentAllMemberS/{id}")
+ public String agentAllMemberS(@PathVariable long id, Model model) {
+ idFromAgentAllMember = id;
+ return FebsUtil.view("modules/mallMember/agentAllMemberS");
+ }
+
+ /**
* 代理级别-设置代理
* @param id
* @param model
@@ -178,7 +211,9 @@
@GetMapping("agentLevelSet/{id}")
@RequiresPermissions("agentLevelSet:update")
public String agentLevelSet(@PathVariable long id, Model model) {
- AdminAgentLevelSetInfoVo data = mallMemberService.getAgentLevelSetInfoByMemberId(id);
+// AdminAgentLevelSetInfoVo data = mallMemberService.getAgentLevelSetInfoByMemberId(id);
+ AdminAgentLevelSetInfoVo data = new AdminAgentLevelSetInfoVo();
+ data.setId(id);
model.addAttribute("agentLevelSet", data);
return FebsUtil.view("modules/mallMember/agentLevelSet");
}
--
Gitblit v1.9.1