From 67dd3f9631b9c0919884061e7b8053a16fe8d6b0 Mon Sep 17 00:00:00 2001
From: KKSU <15274802129@163.com>
Date: Tue, 16 Jan 2024 11:13:47 +0800
Subject: [PATCH] fapiao
---
src/main/java/cc/mrbird/febs/mall/controller/ViewMallMemberController.java | 37 ++++++++++++++++++++++++++++++++++++-
1 files changed, 36 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 25c2a31..7945eee 100644
--- a/src/main/java/cc/mrbird/febs/mall/controller/ViewMallMemberController.java
+++ b/src/main/java/cc/mrbird/febs/mall/controller/ViewMallMemberController.java
@@ -5,9 +5,11 @@
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;
@@ -24,6 +26,7 @@
private final IAdminMallMemberService mallMemberService;
private final MallSalesmanMapper mallSalesmanMapper;
+ private final MallMemberMapper mallMemberMapper;
private final MallAgentRecordMapper mallAgentRecordMapper;
public static long idFromMoneyFlow;
@@ -259,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");
}
@@ -364,5 +373,31 @@
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