banners 前端列表搜索time

liquidnet-bus-service/liquidnet-service-kylin/liquidnet-service-kylin-impl/src/main/java/com/liquidnet/service/kylin/service/impl/admin/KylinBannersServiceImpl.java

@@ -251,20 +251,33 @@ public class KylinBannersServiceImpl extends ServiceImpl<KylinBannersMapper, Kyl
         query.addCriteria(
                 Criteria.where("isOnline").is(1).and("isDeleted").is(1)
         );
+
+        LocalDateTime nowTime = LocalDateTime.now();
+        String nowTimeStr = nowTime.format(DateTimeFormatter.ofPattern("yyyy-MM-dd HH:mm:ss"));
+        Criteria onlineTimeBetween = Criteria.where("onlineStartTime").lte(nowTimeStr).and("onlineEndTime").gte(nowTimeStr);
+        Criteria onlineTimeGt = Criteria.where("onlineStartTime").lte(nowTimeStr).and("onlineEndTime").is("");
+        Criteria onlineTimeLt = Criteria.where("onlineStartTime").is("").and("onlineEndTime").gte(nowTimeStr);
+        Criteria onlineTimeEmpty = Criteria.where("onlineStartTime").is("").and("onlineEndTime").is("");
+        Criteria mergeCriteriaTime = new Criteria();
+        mergeCriteriaTime.orOperator(onlineTimeBetween, onlineTimeGt, onlineTimeLt, onlineTimeEmpty);
+
         if (!bannersApiSearchParam.getPosition().isEmpty()) {
             query.addCriteria(
                     Criteria.where("positionList").in(bannersApiSearchParam.getPosition())
             );
         }
 
+        Criteria mergeCriteriaPromotion = new Criteria();
         if (!bannersApiSearchParam.getProvinceCode().isEmpty()) {
-            Criteria c1 = Criteria.where("provincesList").in(bannersApiSearchParam.getProvinceCode());
-            Criteria c2 = Criteria.where("promotionType").is(1);
-            Criteria cr = new Criteria();
+            Criteria promotionCity = Criteria.where("provincesList").in(bannersApiSearchParam.getProvinceCode());
+            Criteria promotionAll = Criteria.where("promotionType").is(1);
+            mergeCriteriaPromotion.orOperator(promotionCity, promotionAll);
+        }
+
+        Criteria criteria = new Criteria();
         query.addCriteria(
-                    cr.orOperator(c1, c2)
+                criteria.andOperator(mergeCriteriaTime, mergeCriteriaPromotion)
         );
-        }
 
         List bannerList = mongoTemplate.find(
                 query,