From 2a93813e68d02f1447b51117c1493072682ebf57 Mon Sep 17 00:00:00 2001
From: XinWei <2718030729@qq.com>
Date: Wed, 9 Oct 2024 16:22:45 +0800
Subject: [PATCH] =?UTF-8?q?=E5=B0=8F=E7=A8=8B=E5=BA=8F=E6=8B=BC=E5=9B=A2?=
 =?UTF-8?q?=E6=B4=BB=E5=8A=A8=E6=8E=A5=E5=8F=A3=E8=BF=87=E6=BB=A4=E5=B7=B2?=
 =?UTF-8?q?=E8=BF=87=E6=9C=9F=E7=9A=84?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

---
 .../dal/mysql/combination/CombinationActivityMapper.java      | 4 +++-
 .../service/combination/CombinationActivityService.java       | 4 ++--
 2 files changed, 5 insertions(+), 3 deletions(-)

diff --git a/yudao-module-mall/yudao-module-promotion-biz/src/main/java/cn/iocoder/yudao/module/promotion/dal/mysql/combination/CombinationActivityMapper.java b/yudao-module-mall/yudao-module-promotion-biz/src/main/java/cn/iocoder/yudao/module/promotion/dal/mysql/combination/CombinationActivityMapper.java
index 55e975c..be4866a 100644
--- a/yudao-module-mall/yudao-module-promotion-biz/src/main/java/cn/iocoder/yudao/module/promotion/dal/mysql/combination/CombinationActivityMapper.java
+++ b/yudao-module-mall/yudao-module-promotion-biz/src/main/java/cn/iocoder/yudao/module/promotion/dal/mysql/combination/CombinationActivityMapper.java
@@ -36,12 +36,14 @@ public interface CombinationActivityMapper extends BaseMapperX<CombinationActivi
 
     default PageResult<CombinationActivityDO> selectPage(PageParam pageParam, Integer status) {
         return selectPage(pageParam, new LambdaQueryWrapperX<CombinationActivityDO>()
-                .eq(CombinationActivityDO::getStatus, status));
+                .eq(CombinationActivityDO::getStatus, status)
+                .ge(CombinationActivityDO::getEndTime, LocalDateTime.now()));
     }
 
     default List<CombinationActivityDO> selectListByStatus(Integer status, Integer count) {
         return selectList(new LambdaQueryWrapperX<CombinationActivityDO>()
                 .eq(CombinationActivityDO::getStatus, status)
+                .ge(CombinationActivityDO::getEndTime, LocalDateTime.now())
                 .last("LIMIT " + count));
     }
 
diff --git a/yudao-module-mall/yudao-module-promotion-biz/src/main/java/cn/iocoder/yudao/module/promotion/service/combination/CombinationActivityService.java b/yudao-module-mall/yudao-module-promotion-biz/src/main/java/cn/iocoder/yudao/module/promotion/service/combination/CombinationActivityService.java
index 23adc73..9d25a9a 100644
--- a/yudao-module-mall/yudao-module-promotion-biz/src/main/java/cn/iocoder/yudao/module/promotion/service/combination/CombinationActivityService.java
+++ b/yudao-module-mall/yudao-module-promotion-biz/src/main/java/cn/iocoder/yudao/module/promotion/service/combination/CombinationActivityService.java
@@ -101,7 +101,7 @@ public interface CombinationActivityService {
     List<CombinationActivityDO> getCombinationActivityListByIds(Collection<Long> ids);
 
     /**
-     * 获取正在进行的活动分页数据
+     * 获取正在进行的活动分页数据（同时活动未过期）
      *
      * @param count 需要的数量
      * @return 拼团活动分页
@@ -109,7 +109,7 @@ public interface CombinationActivityService {
     List<CombinationActivityDO> getCombinationActivityListByCount(Integer count);
 
     /**
-     * 获取正在进行的活动分页数据
+     * 获取正在进行的活动分页数据（同时活动未过期）
      *
      * @param pageParam 分页请求
      * @return 拼团活动分页