From 7f55c18d7db36c9cad2ac96e481680bc1107e51c Mon Sep 17 00:00:00 2001
From: Hentua <wangdoubleone@gmail.com>
Date: Thu, 15 Jun 2023 11:16:11 +0800
Subject: [PATCH] Merge branch 'meiye_mall' of http://120.27.238.55:7000/r/xc-mall into meiye_mall
---
src/main/java/cc/mrbird/febs/mall/controller/ViewMallMemberController.java | 19 ++++++++++++++++++-
1 files changed, 18 insertions(+), 1 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 048babc..6f84b70 100644
--- a/src/main/java/cc/mrbird/febs/mall/controller/ViewMallMemberController.java
+++ b/src/main/java/cc/mrbird/febs/mall/controller/ViewMallMemberController.java
@@ -16,6 +16,9 @@
import org.springframework.web.bind.annotation.GetMapping;
import org.springframework.web.bind.annotation.PathVariable;
import org.springframework.web.bind.annotation.RequestMapping;
+import org.springframework.web.bind.annotation.RequestParam;
+
+import javax.servlet.http.HttpServletRequest;
@Controller("mallMemberView")
@RequestMapping(FebsConstant.VIEW_PREFIX + "modules/mallMember")
@@ -125,7 +128,9 @@
*/
@GetMapping("moneyFlowList")
@RequiresPermissions("moneyFlowList:view")
- public String moneyFlowList() {
+ public String moneyFlowList(String refererId, String inviteId, Model model) {
+ model.addAttribute("referrerId", refererId);
+ model.addAttribute("inviteId", inviteId);
return FebsUtil.view("modules/mallMember/moneyFlowList");
}
@@ -374,5 +379,17 @@
return FebsUtil.view("modules/mallMember/matrixTree");
}
+ @GetMapping("teamList")
+ public String teamList() {
+ return FebsUtil.view("modules/mallMember/teamList");
+ }
+
+ @GetMapping("teamList/{type}/{inviteId}")
+ public String teamListByInviteId(@PathVariable(value = "inviteId") String inviteId, @PathVariable("type") Integer type, Model model) {
+ model.addAttribute("refererId", inviteId);
+ model.addAttribute("type", type);
+ return FebsUtil.view("modules/mallMember/teamList");
+ }
+
}
--
Gitblit v1.9.1