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/resources/mapper/UserMapper.xml | 17 +++++++++++++++++
1 files changed, 17 insertions(+), 0 deletions(-)
diff --git a/tcm-training-admin-backend/src/main/resources/mapper/UserMapper.xml b/tcm-training-admin-backend/src/main/resources/mapper/UserMapper.xml
index c9a2c54..2c0c23b 100644
--- a/tcm-training-admin-backend/src/main/resources/mapper/UserMapper.xml
+++ b/tcm-training-admin-backend/src/main/resources/mapper/UserMapper.xml
@@ -23,6 +23,21 @@
<if test="isMember != null and isMember == 0">
AND (s.member_expire_at IS NULL OR s.member_expire_at <= NOW())
</if>
+ <if test="memberStatus != null and memberStatus == 'ALL'">
+ AND s.member_expire_at IS NOT NULL
+ </if>
+ <if test="memberStatus != null and memberStatus == 'ACTIVE'">
+ AND s.member_expire_at IS NOT NULL AND s.member_expire_at > NOW()
+ </if>
+ <if test="memberStatus != null and memberStatus == 'EXPIRED'">
+ AND s.member_expire_at IS NOT NULL AND s.member_expire_at <= NOW()
+ </if>
+ <if test="memberExpireFrom != null">
+ AND s.member_expire_at >= #{memberExpireFrom}
+ </if>
+ <if test="memberExpireTo != null">
+ AND s.member_expire_at <= #{memberExpireTo}
+ </if>
<if test="registeredFrom != null">
AND s.created_at >= #{registeredFrom}
</if>
@@ -47,6 +62,7 @@
WHEN s.member_expire_at IS NOT NULL AND s.member_expire_at > NOW() THEN 1
ELSE 0
END AS isMember,
+ s.member_expire_at AS memberExpireAt,
s.created_at AS createdAt
FROM tcm_app_user s
LEFT JOIN tcm_clinic c ON c.id = s.clinic_id AND c.deleted = 0
@@ -70,6 +86,7 @@
WHEN s.member_expire_at IS NOT NULL AND s.member_expire_at > NOW() THEN 1
ELSE 0
END AS isMember,
+ s.member_expire_at AS memberExpireAt,
s.created_at AS createdAt
FROM tcm_app_user s
LEFT JOIN tcm_clinic c ON c.id = s.clinic_id AND c.deleted = 0
--
Gitblit v1.7.1