From 930658f087df885f01cefbba30856303e0528c58 Mon Sep 17 00:00:00 2001
From: KKSU <15274802129@163.com>
Date: Sun, 04 Feb 2024 18:06:49 +0800
Subject: [PATCH] 确认收货更新用户的会员信息
---
src/main/java/cc/mrbird/febs/mall/controller/ViewMallMemberController.java | 138 ++++++++++++++++++++++++++++++++++++++++++++-
1 files changed, 134 insertions(+), 4 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 057d595..709ee5a 100644
--- a/src/main/java/cc/mrbird/febs/mall/controller/ViewMallMemberController.java
+++ b/src/main/java/cc/mrbird/febs/mall/controller/ViewMallMemberController.java
@@ -28,6 +28,10 @@
public static long idFromAgentAllMember;
+ public static long idFromScoreRoleRelease;
+
+ public static long idFromScoreAchieveRelease;
+
/**
* 平台账单
* @return
@@ -46,6 +50,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");
}
/**
@@ -68,12 +82,28 @@
* @param model
* @return
*/
- @GetMapping("mallSystemPay/{id}")
+ @GetMapping("mallSystemPay/{type}/{id}")
@RequiresPermissions("mallSystemPay:update")
- public String systemPay(@PathVariable long id, Model model) {
+ public String systemPay(@PathVariable long id, @PathVariable Integer type, Model model) {
+ MallMemberVo data = mallMemberService.getMallmemberAmountByMemberId(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);
- return FebsUtil.view("modules/mallMember/mallSystemPay");
+ model.addAttribute("type", type);
+ return FebsUtil.view("modules/mallMember/voucherUpdate");
}
/**
@@ -83,6 +113,7 @@
* @return
*/
@GetMapping("moneyFlow/{id}")
+ @RequiresPermissions("moneyFlow:update")
public String moneyFlow(@PathVariable long id, Model model) {
idFromMoneyFlow = id;
return FebsUtil.view("modules/mallMember/moneyFlow");
@@ -117,9 +148,25 @@
@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");
+ }
+
+ /**
+ * 提现列表-付款方式
+ * @param id
+ * @param model
+ * @return
+ */
+ @GetMapping("chargeFlowListType/{id}")
+ @RequiresPermissions("chargeFlowListType:update")
+ public String chargeFlowListType(@PathVariable long id, Model model) {
+ AdminMallMemberPaymentVo data = new AdminMallMemberPaymentVo();
+ data.setId(id);
+ model.addAttribute("chargeUpdateInfo", data);
+ return FebsUtil.view("modules/mallMember/chargeFlowListType");
}
/**
@@ -130,6 +177,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");
}
/**
@@ -166,6 +223,18 @@
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");
}
/**
@@ -253,6 +322,67 @@
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");
+ }
+
--
Gitblit v1.9.1