From a421b06527fce5ebf1a5bb00e51a9bfc4df2626e Mon Sep 17 00:00:00 2001
From: Hentua <wangdoubleone@gmail.com>
Date: Fri, 26 Jan 2024 22:57:20 +0800
Subject: [PATCH] fix
---
src/main/java/cc/mrbird/febs/mall/controller/ViewMallMemberController.java | 140 +++++++++++++++++++++++++++++++++++++++++++++-
1 files changed, 135 insertions(+), 5 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 ef7b482..7945eee 100644
--- a/src/main/java/cc/mrbird/febs/mall/controller/ViewMallMemberController.java
+++ b/src/main/java/cc/mrbird/febs/mall/controller/ViewMallMemberController.java
@@ -3,12 +3,13 @@
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.MallMemberMapper;
+import cc.mrbird.febs.mall.mapper.MallSalesmanMapper;
import cc.mrbird.febs.mall.service.IAdminMallMemberService;
import cc.mrbird.febs.mall.vo.*;
+import cn.hutool.core.util.ObjectUtil;
import lombok.RequiredArgsConstructor;
import org.apache.shiro.authz.annotation.RequiresPermissions;
import org.springframework.stereotype.Controller;
@@ -23,6 +24,10 @@
public class ViewMallMemberController extends BaseController {
private final IAdminMallMemberService mallMemberService;
+
+ private final MallSalesmanMapper mallSalesmanMapper;
+ private final MallMemberMapper mallMemberMapper;
+ private final MallAgentRecordMapper mallAgentRecordMapper;
public static long idFromMoneyFlow;
@@ -257,7 +262,13 @@
@GetMapping("updateReferer/{id}")
public String updateReferer(@PathVariable("id") Long id, Model model) {
MallMember member = mallMemberService.getById(id);
- model.addAttribute("referer", mallMemberService.findByInviteId(member.getReferrerId()));
+ MallMember byInviteId = null;
+ byInviteId = mallMemberService.findByInviteId(member.getReferrerId());
+ if(ObjectUtil.isEmpty(byInviteId)){
+ byInviteId = new MallMember();
+ byInviteId.setName("无推荐人");
+ }
+ model.addAttribute("referer", byInviteId);
model.addAttribute("id", id);
return FebsUtil.view("modules/mallMember/updateRefererId");
}
@@ -267,7 +278,126 @@
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("memberSaleman")
+ @RequiresPermissions("memberSaleman:view")
+ public String memberSaleman() {
+ return FebsUtil.view("modules/mallMember/memberSaleman");
+ }
+
+ /**
+ * 优惠卷列表-选择
+ * @param id
+ * @param model
+ * @return
+ */
+ @GetMapping("couponSelect/{id}")
+ @RequiresPermissions("couponSelect:update")
+ public String couponSelect(@PathVariable long id, Model model) {
+ MallMember mallMember = mallMemberMapper.selectById(id);
+ AdminCouponSelectVo data = new AdminCouponSelectVo();
+ data.setId(mallMember.getId());
+ model.addAttribute("adminCouponSelectVo", data);
+ return FebsUtil.view("modules/mallMember/couponSelect");
+ }
}
--
Gitblit v1.9.1