From dacdca90b0faed8a38d56b2bab0df3ad3b9982b1 Mon Sep 17 00:00:00 2001
From: KKSU <15274802129@163.com>
Date: Wed, 31 Jan 2024 10:38:14 +0800
Subject: [PATCH] 会员列表增加波卷功能
---
src/main/java/cc/mrbird/febs/mall/controller/ViewMallMemberController.java | 197 +++++++++++++++++++++++++++++++++++++++----------
1 files changed, 156 insertions(+), 41 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 8acf032..4b96830 100644
--- a/src/main/java/cc/mrbird/febs/mall/controller/ViewMallMemberController.java
+++ b/src/main/java/cc/mrbird/febs/mall/controller/ViewMallMemberController.java
@@ -3,10 +3,10 @@
import cc.mrbird.febs.common.controller.BaseController;
import cc.mrbird.febs.common.entity.FebsConstant;
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.entity.*;
+import cc.mrbird.febs.mall.mapper.MallAgentRecordMapper;
+import cc.mrbird.febs.mall.mapper.MallMemberHouseMapper;
+import cc.mrbird.febs.mall.mapper.MallSalesmanMapper;
import cc.mrbird.febs.mall.service.IAdminMallMemberService;
import cc.mrbird.febs.mall.vo.*;
import lombok.RequiredArgsConstructor;
@@ -23,6 +23,10 @@
public class ViewMallMemberController extends BaseController {
private final IAdminMallMemberService mallMemberService;
+
+ private final MallSalesmanMapper mallSalesmanMapper;
+ private final MallAgentRecordMapper mallAgentRecordMapper;
+ private final MallMemberHouseMapper mallMemberHouseMapper;
public static long idFromMoneyFlow;
@@ -68,11 +72,12 @@
* @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.getMallMemberInfoById(id);
model.addAttribute("systemPay", data);
+ model.addAttribute("type", type);
return FebsUtil.view("modules/mallMember/mallSystemPay");
}
@@ -183,6 +188,21 @@
}
/**
+ * 卷-设置卷-拨付卷
+ * @param id
+ * @param model
+ * @return
+ */
+ @GetMapping("rollPerkSet/{id}")
+ @RequiresPermissions("rollPerkSet:update")
+ public String rollPerkSet(@PathVariable long id, Model model) {
+ AdminAgentLevelSetInfoVo data = new AdminAgentLevelSetInfoVo();
+ data.setId(id);//会员memberID
+ model.addAttribute("rollperkSet", data);
+ return FebsUtil.view("modules/mallMember/rollperkSet");
+ }
+
+ /**
* 奖励设置-列表
* @return
*/
@@ -240,41 +260,6 @@
return FebsUtil.view("modules/mallMember/appVerSionUpdate");
}
- /**
- * 新闻中心-列表
- * @return
- */
- @GetMapping("newsInfoList")
- @RequiresPermissions("newsInfoList:view")
- public String newsInfoList() {
- return FebsUtil.view("modules/mallMember/newsInfoList");
- }
-
- /**
- * 新闻中心-新增
- * @return
- */
- @GetMapping("newsInfoAdd")
- @RequiresPermissions("newsInfoAdd:add")
- public String newsInfoAdd() {
- return FebsUtil.view("modules/mallMember/newsInfoAdd");
- }
-
- /**
- * 新闻中心-详情
- * @param id
- * @param model
- * @return
- */
- @GetMapping("newsInfoUpdate/{id}")
- @RequiresPermissions("newsInfoUpdate:update")
- public String newsInfoUpdate(@PathVariable long id, Model model) {
- MallNewsInfo data = mallMemberService.getNewsInfoById(id);
- model.addAttribute("newsInfo", data);
- return FebsUtil.view("modules/mallMember/newsInfoUpdate");
- }
-
-
@GetMapping("shopApply")
public String shopApply() {
@@ -288,7 +273,137 @@
return FebsUtil.view("modules/mallMember/shopApplyInfo");
}
+ @GetMapping("updateReferer/{id}")
+ 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")
+ public String addMember() {
+ return FebsUtil.view("modules/mallMember/addMember");
+ }
+
+ /**
+ * 代理申请列表
+ */
+ @GetMapping("mallAgentRecord")
+ @RequiresPermissions("mallAgentRecord:view")
+ public String mallAgentRecord() {
+ return FebsUtil.view("modules/mallMember/mallAgentRecord");
+ }
+
+ /**
+ * 推销员列表
+ */
+ @GetMapping("mallSalesManList")
+ @RequiresPermissions("mallSalesManList:view")
+ public String mallSalesManList() {
+ return FebsUtil.view("modules/mallMember/mallSalesManList");
+ }
+
+ /**
+ * 推销员列表-新增
+ */
+ @GetMapping("addSalesman")
+ @RequiresPermissions("addSalesman:view")
+ public String addSalesman() {
+ return FebsUtil.view("modules/mallMember/addSalesman");
+ }
+
+ /**
+ * 推销员列表-详情
+ */
+ @GetMapping("salesmanUpdate/{id}")
+ @RequiresPermissions("salesmanUpdate:update")
+ public String salesmanUpdate(@PathVariable long id, Model model) {
+ MallSalesman mallSalesman = mallSalesmanMapper.selectById(id);
+ model.addAttribute("mallSalesman", mallSalesman);
+ return FebsUtil.view("modules/mallMember/salesmanUpdate");
+ }
+
+ /**
+ * 推销员列表-选择
+ * @param id
+ * @param model
+ * @return
+ */
+ @GetMapping("agentSelect/{id}")
+ @RequiresPermissions("agentSelect:update")
+ public String agentSelect(@PathVariable long id, Model model) {
+ AdminAgentSelectVo data = mallSalesmanMapper.agentSelect(id);
+ model.addAttribute("adminAgentSelectVo", data);
+ return FebsUtil.view("modules/mallMember/agentSelect");
+ }
+
+ /**
+ * 地址金额统计列表
+ */
+ @GetMapping("addressAmountList")
+ @RequiresPermissions("addressAmountList:view")
+ public String addressAmountList() {
+ return FebsUtil.view("modules/mallMember/addressAmountList");
+ }
+
+ /**
+ * 地址金额统计列表
+ */
+ @GetMapping("salesmanAchieveList")
+ @RequiresPermissions("salesmanAchieveList:view")
+ public String salesmanAchieveList() {
+ return FebsUtil.view("modules/mallMember/salesmanAchieveList");
+ }
+
+ /**
+ * 合伙人业绩列表
+ */
+ @GetMapping("agentAchieveList")
+ @RequiresPermissions("agentAchieveList:view")
+ public String agentAchieveList() {
+ return FebsUtil.view("modules/mallMember/agentAchieveList");
+ }
+
+ /**
+ * 合伙人代理等级列表-选择
+ * @param id
+ * @param model
+ * @return
+ */
+ @GetMapping("agentVerify/{id}")
+ @RequiresPermissions("agentVerify:update")
+ public String agentVerify(@PathVariable long id, Model model) {
+ MallAgentRecord mallAgentRecord = mallAgentRecordMapper.selectById(id);
+ AdminAgentVerifyVo data = new AdminAgentVerifyVo();
+ data.setId(mallAgentRecord.getId());
+ model.addAttribute("adminAgentVerifyVo", data);
+ return FebsUtil.view("modules/mallMember/agentVerify");
+ }
+
+ /**
+ * 民宿核销列表
+ * @return
+ */
+ @GetMapping("rollHouseList")
+ @RequiresPermissions("rollHouseList:view")
+ public String rollHouseList() {
+ return FebsUtil.view("modules/mallMember/rollHouseList");
+ }
+
+ /**
+ * 民宿核销列表-核销
+ * @param id
+ * @param model
+ * @return
+ */
+ @GetMapping("rollHouseCheck/{id}")
+ @RequiresPermissions("rollHouseCheck:update")
+ public String rollHouseCheck(@PathVariable long id, Model model) {
+ MallMemberHouse mallMemberHouse = mallMemberHouseMapper.selectById(id);
+ model.addAttribute("mallMemberHouse", mallMemberHouse);
+ return FebsUtil.view("modules/mallMember/rollHouseCheck");
+ }
}
--
Gitblit v1.9.1