拼团参与中只返回没结束的

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();