From 7ee466ebc953bb5640bcf42f2b8e2a87aa471c21 Mon Sep 17 00:00:00 2001
From: MrShi <1878285526@qq.com>
Date: 星期三, 15 四月 2026 20:12:21 +0800
Subject: [PATCH] Merge branch 'master' of http://139.186.142.91:10010/r/productDev/gtzxinglijicun

---
 server/admin/src/main/java/com/doumee/api/business/MemberController.java |   25 +++++++++++++++++++++++++
 1 files changed, 25 insertions(+), 0 deletions(-)

diff --git a/server/admin/src/main/java/com/doumee/api/business/MemberController.java b/server/admin/src/main/java/com/doumee/api/business/MemberController.java
index 44f1dd1..16544ac 100644
--- a/server/admin/src/main/java/com/doumee/api/business/MemberController.java
+++ b/server/admin/src/main/java/com/doumee/api/business/MemberController.java
@@ -8,6 +8,9 @@
 import com.doumee.core.model.PageData;
 import com.doumee.core.model.PageWrap;
 import com.doumee.dao.business.model.Member;
+import com.doumee.dao.dto.MemberListQueryDTO;
+import com.doumee.dao.vo.MemberDetailVO;
+import com.doumee.dao.vo.MemberListVO;
 import com.doumee.service.business.MemberService;
 import com.github.xiaoymin.knife4j.core.util.CollectionUtils;
 import io.swagger.annotations.Api;
@@ -93,4 +96,26 @@
     public ApiResponse findById(@PathVariable Integer id) {
         return ApiResponse.success(memberService.findById(id));
     }
+
+    @ApiOperation("浼氬憳鍒楄〃鍒嗛〉鏌ヨ")
+    @PostMapping("/list/page")
+    @RequiresPermissions("business:member:query")
+    public ApiResponse<PageData<MemberListVO>> findMemberListPage(@RequestBody PageWrap<MemberListQueryDTO> pageWrap) {
+        return ApiResponse.success(memberService.findMemberListPage(pageWrap));
+    }
+
+    @ApiOperation("浼氬憳鍒楄〃瀵煎嚭Excel")
+    @PostMapping("/list/exportExcel")
+    @RequiresPermissions("business:member:exportExcel")
+    public void exportMemberListExcel(@RequestBody PageWrap<MemberListQueryDTO> pageWrap, HttpServletResponse response) {
+        List<MemberListVO> list = memberService.findMemberListPage(pageWrap).getRecords();
+        ExcelExporter.build(MemberListVO.class).export(list, "浼氬憳鍒楄〃", response);
+    }
+
+    @ApiOperation("浼氬憳璇︽儏鏌ヨ")
+    @GetMapping("/detail/{id}")
+    @RequiresPermissions("business:member:query")
+    public ApiResponse<MemberDetailVO> findMemberDetail(@PathVariable Integer id) {
+        return ApiResponse.success(memberService.findMemberDetail(id));
+    }
 }

--
Gitblit v1.9.3