From 390b7ff440162939e496ed9a80aeacc0409b4ed8 Mon Sep 17 00:00:00 2001
From: =?UTF-8?q?=E7=A3=B7=E5=8F=B6?=
 <14103883+leaf-phos@user.noreply.gitee.com>
Date: Tue, 27 May 2025 16:13:29 +0800
Subject: [PATCH] =?UTF-8?q?=E5=8D=A1=E5=88=B8=E5=8A=9F=E8=83=BD?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

---
 .../java/com/ruoyi/bst/vipUser/domain/VipUserQuery.java  | 6 ++++++
 .../java/com/ruoyi/bst/vipUser/mapper/VipUserMapper.xml  | 9 +++++++++
 2 files changed, 15 insertions(+)

diff --git a/ruoyi-service/src/main/java/com/ruoyi/bst/vipUser/domain/VipUserQuery.java b/ruoyi-service/src/main/java/com/ruoyi/bst/vipUser/domain/VipUserQuery.java
index 08c9646..3403de0 100644
--- a/ruoyi-service/src/main/java/com/ruoyi/bst/vipUser/domain/VipUserQuery.java
+++ b/ruoyi-service/src/main/java/com/ruoyi/bst/vipUser/domain/VipUserQuery.java
@@ -10,6 +10,12 @@ public class VipUserQuery extends VipUserVO {
     
     @ApiModelProperty("ID列表")
     private List<Long> ids;
+
+    @ApiModelProperty("是否在有效期内")
+    private Boolean isEffective;
+
+    @ApiModelProperty("最小剩余次数")
+    private Integer minSurplusCount;
     
 }
     
\ No newline at end of file
diff --git a/ruoyi-service/src/main/java/com/ruoyi/bst/vipUser/mapper/VipUserMapper.xml b/ruoyi-service/src/main/java/com/ruoyi/bst/vipUser/mapper/VipUserMapper.xml
index 2457f18..b43f7fd 100644
--- a/ruoyi-service/src/main/java/com/ruoyi/bst/vipUser/mapper/VipUserMapper.xml
+++ b/ruoyi-service/src/main/java/com/ruoyi/bst/vipUser/mapper/VipUserMapper.xml
@@ -51,6 +51,15 @@ PUBLIC "-//mybatis.org//DTD Mapper 3.0//EN"
         <if test="query.discount != null "> and bvu.discount = #{query.discount}</if>
         <if test="query.limitRound != null "> and bvu.limit_round = #{query.limitRound}</if>
         <if test="query.limitCount != null "> and bvu.limit_count = #{query.limitCount}</if>
+        <if test="query.isEffective != null ">
+            <if test="query.isEffective == true">
+                and bvu.end_time &gt;= now() and bvu.start_time &lt;= now()
+            </if>
+            <if test="query.isEffective == false">
+                and (bvu.end_time &lt;= now() or bvu.start_time &gt;= now())
+            </if>
+        </if>
+        <if test="query.minSurplusCount != null "> and bvu.surplus_total &gt;= #{query.minSurplusCount}</if>
         <if test="query.ids != null and query.ids.size > 0"> 
             and bvu.id in
             <foreach item="item" collection="query.ids" open="(" separator="," close=")">