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 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" and bvu.discount = #{query.discount} and bvu.limit_round = #{query.limitRound} and bvu.limit_count = #{query.limitCount} + + + and bvu.end_time >= now() and bvu.start_time <= now() + + + and (bvu.end_time <= now() or bvu.start_time >= now()) + + + and bvu.surplus_total >= #{query.minSurplusCount} and bvu.id in