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 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 yxStorePinkIPage = yxStorePinkMapper.selectPage(pageModel, wrapper); List collect = yxStorePinkIPage.getRecords().stream().map(i -> { YxStoreCombinationQueryVo yxStoreCombinationQueryVo = new YxStoreCombinationQueryVo();