时间标签

src/main/java/com/izouma/dingdong/service/merchant/MerchantSettingsService.java

@@ -143,10 +143,34 @@ public class MerchantSettingsService {
         //时间标签
         List<TimeTag> timeTags = timeTagRepo.findAll();
         LocalTime now = LocalTime.now();
+
         List<TimeTag> timeTag = timeTags.stream()
                 .filter(t -> now.isAfter(t.getStartTime()) && now.isBefore(t.getEndTime()))
                 .collect(Collectors.toList());
 
+        if (CollUtil.isEmpty(timeTag)) {
+            timeTags.forEach(t -> {
+                if (t.getEndTime().compareTo(t.getStartTime()) < 0) {
+                    if ((now.isAfter(t.getEndTime()) && now.isBefore(LocalTime.MAX)) || (now.isBefore(t.getStartTime()) && now
+                            .isAfter(LocalTime.MIDNIGHT))) {
+                        timeTag.add(t);
+                    }
+                }
+            });
+        }
+/*        List<TimeTag> timeTag = new ArrayList<>();
+        timeTags.forEach(t -> {
+            if (t.getEndTime().compareTo(t.getStartTime()) < 0) {
+                if (now.isAfter(t.getEndTime()) && now.isBefore(LocalTime.MAX)) {
+                    timeTag.add(t);
+                }
+            } else {
+                if (now.isAfter(t.getStartTime()) && now.isBefore(t.getEndTime())) {
+                    timeTag.add(t);
+                }
+            }
+        });*/
+
         //优惠专区
         //主推荐位 2个
         List<Promote> promote1 = promoteRepo.findAllByAction(1);