演出预告 总体3天 当天和3天内的巡演也排重

liquidnet-bus-service/liquidnet-service-kylin/liquidnet-service-kylin-impl/src/main/java/com/liquidnet/service/kylin/utils/DataUtils.java

@@ -29,6 +29,7 @@ import java.math.BigDecimal;
 import java.time.LocalDateTime;
 import java.util.*;
 import java.util.regex.Pattern;
+import java.util.stream.Collectors;
 
 @Component
 @Slf4j
@@ -364,6 +365,7 @@ public class DataUtils {
             query.fields().exclude("ticketTimeList");
             query.fields().exclude("describeElectronic");
             List<KylinPerformanceVo> toDayList = mongoTemplate.find(query, KylinPerformanceVo.class, KylinPerformanceVo.class.getSimpleName());
+            List<String> roadShowId = toDayList.stream().filter(r -> !r.getRoadShowId().equals("0")).map(KylinPerformanceVo -> KylinPerformanceVo.getRoadShowId()).collect(Collectors.toList());
 
             // 固定条件
             Query queryT = getCommonWhere();
@@ -374,7 +376,7 @@ public class DataUtils {
             // 三天的
             Calendar cal = Calendar.getInstance();
             cal.setTime((Date) toDayTime.get("end"));
-            Date beforeDayEnd = DateUtil.getBeforeDayEnd(cal, 3);
+            Date beforeDayEnd = DateUtil.getBeforeDayEnd(cal, 2);
             String threeDaysLaterStr = DateUtil.SDF_YMD_HMS.format(beforeDayEnd);
 
             queryT.addCriteria(Criteria.where("sellTime").gte(toDayEndTimeStr).lt(threeDaysLaterStr));
@@ -382,6 +384,7 @@ public class DataUtils {
             queryT.fields().exclude("noticeImage");
             queryT.fields().exclude("ticketTimeList");
             queryT.fields().exclude("describeElectronic");
+            queryT.addCriteria(Criteria.where("roadShowId").nin(roadShowId));
             List<KylinPerformanceVo> threeDaysList = mongoTemplate.find(queryT, KylinPerformanceVo.class, KylinPerformanceVo.class.getSimpleName());
 
             HashMap<String, Object> info = CollectionUtil.mapStringObject();