From c8b658df0004f9698f20d7017703e0901fcf8b15 Mon Sep 17 00:00:00 2001
From: xiaoyong931011 <15274802129@163.com>
Date: Wed, 26 Jul 2023 13:00:57 +0800
Subject: [PATCH] 短信认证
---
src/main/java/cc/mrbird/febs/mall/controller/ViewMallMemberController.java | 152 +++++++++++++++++++++++++++++++++++++++++---------
1 files changed, 123 insertions(+), 29 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 efd106c..25c2a31 100644
--- a/src/main/java/cc/mrbird/febs/mall/controller/ViewMallMemberController.java
+++ b/src/main/java/cc/mrbird/febs/mall/controller/ViewMallMemberController.java
@@ -3,9 +3,9 @@
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.*;
+import cc.mrbird.febs.mall.mapper.MallAgentRecordMapper;
+import cc.mrbird.febs.mall.mapper.MallSalesmanMapper;
import cc.mrbird.febs.mall.service.IAdminMallMemberService;
import cc.mrbird.febs.mall.vo.*;
import lombok.RequiredArgsConstructor;
@@ -23,9 +23,22 @@
private final IAdminMallMemberService mallMemberService;
+ private final MallSalesmanMapper mallSalesmanMapper;
+ private final MallAgentRecordMapper mallAgentRecordMapper;
+
public static long idFromMoneyFlow;
public static long idFromAgentAllMember;
+
+ /**
+ * 平台账单
+ * @return
+ */
+ @GetMapping("mallDataList")
+ @RequiresPermissions("mallDataList:view")
+ public String mallDataList() {
+ return FebsUtil.view("modules/mallMember/mallDataList");
+ }
/**
* 会员列表
@@ -57,11 +70,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");
}
@@ -229,46 +243,126 @@
return FebsUtil.view("modules/mallMember/appVerSionUpdate");
}
- /**
- * 新闻中心-列表
- * @return
- */
- @GetMapping("newsInfoList")
- @RequiresPermissions("newsInfoList:view")
- public String newsInfoList() {
- return FebsUtil.view("modules/mallMember/newsInfoList");
+
+ @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}")
+ 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");
}
/**
- * 新闻中心-新增
- * @return
+ * 代理申请列表
*/
- @GetMapping("newsInfoAdd")
- @RequiresPermissions("newsInfoAdd:add")
- public String newsInfoAdd() {
- return FebsUtil.view("modules/mallMember/newsInfoAdd");
+ @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("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("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");
+ }
}
--
Gitblit v1.9.1