From ac9126763134c6eaf7eb96c6ed597809a6d7fc8b Mon Sep 17 00:00:00 2001
From: Administrator <15274802129@163.com>
Date: Fri, 10 Oct 2025 10:04:51 +0800
Subject: [PATCH] feat(mall): 添加会员公司信息展示功能

---
 src/main/java/cc/mrbird/febs/mall/controller/member/AdminMallMemberController.java |   27 ++++++++++++++++++++++++++-
 1 files changed, 26 insertions(+), 1 deletions(-)

diff --git a/src/main/java/cc/mrbird/febs/mall/controller/member/AdminMallMemberController.java b/src/main/java/cc/mrbird/febs/mall/controller/member/AdminMallMemberController.java
index 19bd9af..0a71bf1 100644
--- a/src/main/java/cc/mrbird/febs/mall/controller/member/AdminMallMemberController.java
+++ b/src/main/java/cc/mrbird/febs/mall/controller/member/AdminMallMemberController.java
@@ -60,9 +60,25 @@
      */
     @GetMapping("getMallMemberList")
     public FebsResponse getMallMemberList(MallMember mallMember, QueryRequest request) {
+
+        String companyId = getCurrentUserCompanyId();
+        mallMember.setCompanyId(companyId);
         Map<String, Object> data = getDataTable(mallMemberService.getMallMemberList(mallMember, request));
         return new FebsResponse().success().data(data);
     }
+
+//    /**
+//     * 会员列表
+//     *
+//     * @param mallMember
+//     * @param request
+//     * @return
+//     */
+//    @GetMapping("getMallMemberList")
+//    public FebsResponse getMallMemberList(MallMember mallMember, QueryRequest request) {
+//        Map<String, Object> data = getDataTable(mallMemberService.getMallMemberList(mallMember, request));
+//        return new FebsResponse().success().data(data);
+//    }
 
     /**
      * 会员列表---禁止
@@ -589,7 +605,7 @@
     }
 
     /**
-     * 会员列表-核销员设置
+     * 会员列表-活动核销员设置
      */
     @GetMapping("checkOrder/{id}")
     @ControllerEndpoint(operation = " 会员列表-核销员设置", exceptionMessage = "操作失败")
@@ -598,6 +614,15 @@
     }
 
     /**
+     * 会员列表-自提核销核销员设置
+     */
+    @GetMapping("checkLeader/{id}")
+    @ControllerEndpoint(operation = " 会员列表-自提核销员设置", exceptionMessage = "操作失败")
+    public FebsResponse checkLeader(@NotNull(message = "{required}") @PathVariable Long id) {
+        return mallMemberService.checkLeader(id);
+    }
+
+    /**
      * 会员列表-推销员设置
      */
     @GetMapping("downSale/{id}")

--
Gitblit v1.9.1