From 7966b494ddea2c27ecec6ed031521cb889ab19f5 Mon Sep 17 00:00:00 2001
From: Administrator <15274802129@163.com>
Date: Fri, 25 Apr 2025 15:18:19 +0800
Subject: [PATCH] feat(mall): 增加会员列表核销员设置功能并优化相关页面
---
src/main/java/cc/mrbird/febs/mall/controller/ViewMallMemberController.java | 123 ++++++++++++++++++++++++++++++++++++++++
1 files changed, 122 insertions(+), 1 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 2de3e48..156b641 100644
--- a/src/main/java/cc/mrbird/febs/mall/controller/ViewMallMemberController.java
+++ b/src/main/java/cc/mrbird/febs/mall/controller/ViewMallMemberController.java
@@ -4,9 +4,12 @@
import cc.mrbird.febs.common.entity.FebsConstant;
import cc.mrbird.febs.common.utils.FebsUtil;
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;
@@ -14,6 +17,9 @@
import org.springframework.web.bind.annotation.GetMapping;
import org.springframework.web.bind.annotation.PathVariable;
import org.springframework.web.bind.annotation.RequestMapping;
+
+import java.util.HashMap;
+import java.util.Map;
@Controller("mallMemberView")
@RequestMapping(FebsConstant.VIEW_PREFIX + "modules/mallMember")
@@ -23,6 +29,8 @@
private final IAdminMallMemberService mallMemberService;
private final MallSalesmanMapper mallSalesmanMapper;
+ private final MallMemberMapper mallMemberMapper;
+ private final MallAgentRecordMapper mallAgentRecordMapper;
public static long idFromMoneyFlow;
@@ -257,7 +265,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");
}
@@ -305,5 +319,112 @@
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");
+ }
+
+ @GetMapping("vipLevelSetting/{id}")
+ public String vipLevelSetting(@PathVariable(value = "id") String id, Model model) {
+ MallMember mallMember = mallMemberMapper.selectById(id);
+
+ Map<String, Object> data = new HashMap<>();
+ data.put("id", mallMember.getId());
+ data.put("level", mallMember.getLevel());
+ model.addAttribute("vipLevelSet", data);
+ return FebsUtil.view("modules/mallMember/vip-level-setting");
+ }
+
+ @GetMapping("addCoupon/{id}")
+ public String addCoupon(@PathVariable long id, Model model) {
+// AdminAgentLevelSetInfoVo data = mallMemberService.getAgentLevelSetInfoByMemberId(id);
+ model.addAttribute("memberId", id);
+ return FebsUtil.view("modules/mallMember/member-coupon-select");
+ }
+
+
+ @GetMapping("memberBenefitsList")
+ @RequiresPermissions("memberBenefitsList:view")
+ public String memberBenefitsList() {
+ return FebsUtil.view("modules/mallMember/memberBenefitsList");
+ }
}
--
Gitblit v1.9.1