From 2f05b4e14515e0a7dd7e76e8bf0e40ec1d8ef8e2 Mon Sep 17 00:00:00 2001
From: “mitao” <“2763622819@qq.com”>
Date: 星期五, 27 三月 2026 19:13:20 +0800
Subject: [PATCH] fix:会员列表

---
 tcm-training-admin-backend/src/main/java/com/tcm/training/admin/member/controller/UserController.java |   14 ++++++++++++--
 1 files changed, 12 insertions(+), 2 deletions(-)

diff --git a/tcm-training-admin-backend/src/main/java/com/tcm/training/admin/member/controller/UserController.java b/tcm-training-admin-backend/src/main/java/com/tcm/training/admin/member/controller/UserController.java
index 9c31cc7..b663974 100644
--- a/tcm-training-admin-backend/src/main/java/com/tcm/training/admin/member/controller/UserController.java
+++ b/tcm-training-admin-backend/src/main/java/com/tcm/training/admin/member/controller/UserController.java
@@ -49,10 +49,14 @@
             @RequestParam(required = false) Long clinicId,
             @RequestParam(required = false) Integer status,
             @RequestParam(required = false) Integer isMember,
+            @RequestParam(required = false) String memberStatus,
+            @RequestParam(required = false) @DateTimeFormat(pattern = "yyyy-MM-dd HH:mm:ss") LocalDateTime memberExpireFrom,
+            @RequestParam(required = false) @DateTimeFormat(pattern = "yyyy-MM-dd HH:mm:ss") LocalDateTime memberExpireTo,
             @RequestParam(required = false) @DateTimeFormat(pattern = "yyyy-MM-dd HH:mm:ss") LocalDateTime registeredFrom,
             @RequestParam(required = false) @DateTimeFormat(pattern = "yyyy-MM-dd HH:mm:ss") LocalDateTime registeredTo) {
         return ApiResponse.ok(userAppService.page(
-                page, pageSize, nickname, phone, clinicId, status, isMember, registeredFrom, registeredTo
+                page, pageSize, nickname, phone, clinicId, status, isMember,
+                memberStatus, memberExpireFrom, memberExpireTo, registeredFrom, registeredTo
         ));
     }
 
@@ -64,9 +68,15 @@
             @RequestParam(required = false) Long clinicId,
             @RequestParam(required = false) Integer status,
             @RequestParam(required = false) Integer isMember,
+            @RequestParam(required = false) String memberStatus,
+            @RequestParam(required = false) @DateTimeFormat(pattern = "yyyy-MM-dd HH:mm:ss") LocalDateTime memberExpireFrom,
+            @RequestParam(required = false) @DateTimeFormat(pattern = "yyyy-MM-dd HH:mm:ss") LocalDateTime memberExpireTo,
             @RequestParam(required = false) @DateTimeFormat(pattern = "yyyy-MM-dd HH:mm:ss") LocalDateTime registeredFrom,
             @RequestParam(required = false) @DateTimeFormat(pattern = "yyyy-MM-dd HH:mm:ss") LocalDateTime registeredTo) throws IOException {
-        userAppService.export(nickname, phone, clinicId, status, isMember, registeredFrom, registeredTo, response);
+        userAppService.export(
+                nickname, phone, clinicId, status, isMember,
+                memberStatus, memberExpireFrom, memberExpireTo, registeredFrom, registeredTo, response
+        );
     }
 
     @GetMapping("/users/{id}")

--
Gitblit v1.7.1