From 8bf923b44bbe9b45b73ddcc25df75c9c59f54e07 Mon Sep 17 00:00:00 2001
From: Hentua <wangdoubleone@gmail.com>
Date: Thu, 15 Jun 2023 11:19:44 +0800
Subject: [PATCH] fix
---
src/main/java/cc/mrbird/febs/mall/controller/ViewMallMemberController.java | 188 ++++++++++++++++++++++++++++++++++++++++++++++
1 files changed, 186 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 62dc4d1..6f84b70 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,8 @@
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.entity.MallNewsInfo;
+import cc.mrbird.febs.mall.entity.MallShopApply;
import cc.mrbird.febs.mall.service.IAdminMallMemberService;
import cc.mrbird.febs.mall.vo.*;
import lombok.RequiredArgsConstructor;
@@ -14,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")
@@ -26,6 +31,20 @@
public static long idFromAgentAllMember;
+ public static long idFromScoreRoleRelease;
+
+ public static long idFromScoreAchieveRelease;
+
+ /**
+ * 平台账单
+ * @return
+ */
+ @GetMapping("mallDataList")
+ @RequiresPermissions("mallDataList:view")
+ public String mallDataList() {
+ return FebsUtil.view("modules/mallMember/mallDataList");
+ }
+
/**
* 会员列表
* @return
@@ -34,6 +53,16 @@
@RequiresPermissions("mallMemberList:view")
public String mallMember() {
return FebsUtil.view("modules/mallMember/mallMemberList");
+ }
+
+ /**
+ * 会员列表
+ * @return
+ */
+ @GetMapping("mallMemberListS")
+ @RequiresPermissions("mallMemberListS:view")
+ public String mallMemberListS() {
+ return FebsUtil.view("modules/mallMember/mallMemberListS");
}
/**
@@ -51,12 +80,43 @@
}
/**
+ * 会员列表-系统拨付
+ * @param id
+ * @param model
+ * @return
+ */
+ @GetMapping("mallSystemPay/{type}/{id}")
+ @RequiresPermissions("mallSystemPay:update")
+ public String systemPay(@PathVariable long id, @PathVariable Integer type, Model model) {
+ MallMemberVo data = mallMemberService.getMallMemberInfoById(id);
+ model.addAttribute("systemPay", data);
+ model.addAttribute("type", type);
+ return FebsUtil.view("modules/mallMember/mallSystemPay");
+ }
+
+ /**
+ * 会员列表-系统拨付绿色凭证
+ * @param id
+ * @param model
+ * @return
+ */
+ @GetMapping("voucherUpdate/{type}/{id}")
+ @RequiresPermissions("voucherUpdate:update")
+ public String voucherUpdate(@PathVariable long id, @PathVariable Integer type, Model model) {
+ MallMemberVo data = mallMemberService.getMallMemberInfoById(id);
+ model.addAttribute("systemPay", data);
+ model.addAttribute("type", type);
+ return FebsUtil.view("modules/mallMember/voucherUpdate");
+ }
+
+ /**
* 会员列表-资金流水
* @param id
* @param model
* @return
*/
@GetMapping("moneyFlow/{id}")
+ @RequiresPermissions("moneyFlow:update")
public String moneyFlow(@PathVariable long id, Model model) {
idFromMoneyFlow = id;
return FebsUtil.view("modules/mallMember/moneyFlow");
@@ -68,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");
}
@@ -91,7 +153,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");
}
@@ -104,6 +167,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");
}
/**
@@ -140,6 +213,32 @@
public String agentAllMember(@PathVariable long id, Model model) {
idFromAgentAllMember = id;
return FebsUtil.view("modules/mallMember/agentAllMember");
+ }
+
+ /**
+ * 代理级别-全部成员
+ * @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
+ * @return
+ */
+ @GetMapping("agentLevelSet/{id}")
+ @RequiresPermissions("agentLevelSet:update")
+ public String agentLevelSet(@PathVariable long id, Model model) {
+ AdminAgentLevelSetInfoVo data = mallMemberService.getAgentLevelSetInfoByMemberId(id);
+ model.addAttribute("agentLevelSet", data);
+ return FebsUtil.view("modules/mallMember/agentLevelSet");
}
/**
@@ -201,11 +300,96 @@
}
+ @GetMapping("shopApply")
+ public String shopApply() {
+ return FebsUtil.view("modules/mallMember/shopApply");
+ }
+
+ @GetMapping("applyDetail/{id}")
+ public String applyDetail(@PathVariable("id") Long id, Model model) {
+ MallShopApply apply = mallMemberService.findShopApplyById(id);
+ model.addAttribute("apply", apply);
+ return FebsUtil.view("modules/mallMember/shopApplyInfo");
+ }
+
+ @GetMapping("updateReferer/{id}")
+ @RequiresPermissions("updateReferer:update")
+ public String updateReferer(@PathVariable("id") Long id, Model model) {
+ MallMember member = mallMemberService.getById(id);
+ model.addAttribute("referer", mallMemberService.findByInviteId(member.getReferrerId()));
+ model.addAttribute("id", id);
+ return FebsUtil.view("modules/mallMember/updateRefererId");
+ }
+
+ @GetMapping("addMember")
+ @RequiresPermissions("addMember:update")
+ public String addMember() {
+ return FebsUtil.view("modules/mallMember/addMember");
+ }
+ /**
+ * 创世释放记录-列表
+ * @return
+ */
+ @GetMapping("scoreRoleRelease")
+ @RequiresPermissions("scoreRoleRelease:view")
+ public String scoreRoleRelease() {
+ return FebsUtil.view("modules/mallMember/scoreRoleRelease");
+ }
+
+ /**
+ * 创世释放记录-全部记录
+ * @param id
+ * @param model
+ * @return
+ */
+ @GetMapping("scoreRoleReleaseList/{id}")
+ public String scoreRoleReleaseList(@PathVariable long id, Model model) {
+ idFromScoreRoleRelease = id;
+ return FebsUtil.view("modules/mallMember/scoreRoleReleaseList");
+ }
+ /**
+ * 业绩释放记录-列表
+ * @return
+ */
+ @GetMapping("scoreAchieveRelease")
+ @RequiresPermissions("scoreAchieveRelease:view")
+ public String scoreAchieveRelease() {
+ return FebsUtil.view("modules/mallMember/scoreAchieveRelease");
+ }
+ /**
+ * 业绩释放记录-全部记录
+ * @param id
+ * @param model
+ * @return
+ */
+ @GetMapping("scoreAchieveReleaseList/{id}")
+ public String scoreAchieveReleaseList(@PathVariable long id, Model model) {
+ idFromScoreAchieveRelease = id;
+ return FebsUtil.view("modules/mallMember/scoreAchieveReleaseList");
+ }
+
+
+ @GetMapping("matrixTree")
+ public String matrixTree() {
+ 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