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 |   64 +++++++++++++++++++++++++++++++
 1 files changed, 63 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 ce589b0..7945eee 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;
@@ -23,6 +26,8 @@
     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");
     }
@@ -337,5 +348,56 @@
         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