From 1e37d646d23acc33b43e8b6a8e9f0de4c5901ec0 Mon Sep 17 00:00:00 2001
From: sj <1304317391@qq.com>
Date: Thu, 1 Dec 2022 16:49:10 +0800
Subject: [PATCH] =?UTF-8?q?=E6=8B=BC=E5=9B=A2=E5=8F=82=E4=B8=8E=E4=B8=AD?=
 =?UTF-8?q?=E5=8F=AA=E8=BF=94=E5=9B=9E=E6=B2=A1=E7=BB=93=E6=9D=9F=E7=9A=84?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

---
 .../activity/service/impl/YxStoreCombinationServiceImpl.java  | 4 ++--
 1 file changed, 2 insertions(+), 2 deletions(-)

diff --git a/zsw-bxg/src/main/java/co/yixiang/modules/activity/service/impl/YxStoreCombinationServiceImpl.java b/zsw-bxg/src/main/java/co/yixiang/modules/activity/service/impl/YxStoreCombinationServiceImpl.java
index 862f827f..636f6138 100644
--- a/zsw-bxg/src/main/java/co/yixiang/modules/activity/service/impl/YxStoreCombinationServiceImpl.java
+++ b/zsw-bxg/src/main/java/co/yixiang/modules/activity/service/impl/YxStoreCombinationServiceImpl.java
@@ -213,8 +213,8 @@ public class YxStoreCombinationServiceImpl extends BaseServiceImpl<YxStoreCombin
         LambdaQueryWrapper<YxStorePink> wrapper = new LambdaQueryWrapper<>();
         //Status:1 进行中  KId:0 发起人是自己
         wrapper.eq(YxStorePink::getStatus,1)
-                .eq(YxStorePink::getUid,uid);
-//                .eq(YxStorePink::getKId,0);
+                .eq(YxStorePink::getUid,uid)
+                .gt(YxStorePink::getStopTime,new Date()); //没结束的
         IPage<YxStorePink> yxStorePinkIPage = yxStorePinkMapper.selectPage(pageModel, wrapper);
         List<YxStoreCombinationQueryVo> collect = yxStorePinkIPage.getRecords().stream().map(i -> {
             YxStoreCombinationQueryVo yxStoreCombinationQueryVo = new YxStoreCombinationQueryVo();