Merge remote-tracking branch 'origin/dev' into dev

liquidnet-bus-api/liquidnet-service-kylin-api/src/main/java/com/liquidnet/service/kylin/constant/KylinRedisConst.java

@@ -4,7 +4,7 @@ public class KylinRedisConst {
     public static final String FIELDS = "kylin:fields:id";
     public static final String PERFORMANCES = "kylin:performances:id:";
     public static final String PERFORMANCES_LIST_CITYNAME = "kylin:performances:cityName:";
-    public static final String PERFORMANCES_LIST_ALL = "kylin:performances:cityName.*";
+    public static final String PERFORMANCES_LIST_ALL = "kylin:performances:cityName*";
     public static final String PERFORMANCES_LIST_RECOMMEND = "kylin:performances:recommend";
     public static final String PERFORMANCES_ROADLIST = "kylin:performances:roadShowId:";
     public static final String PERFORMANCES_RECOMMEND = "kylin:performances:recommend:id:";

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

@@ -299,6 +299,9 @@ public class KylinPerformancesServiceImpl extends ServiceImpl<KylinPerformancesM
         Document queryObject = new Document();
         queryObject.put("title", Pattern.compile(title, Pattern.CASE_INSENSITIVE));
         Query query = new BasicQuery(queryObject);
+        LocalDateTime nowTime = LocalDateTime.now();
+        String nowTimeStr = DateUtil.Formatter.yyyyMMddHHmmss.format(nowTime);
+        query.addCriteria(Criteria.where("timeEnd").gte(nowTimeStr));
 
         long count = mongoTemplate.count(query, KylinPerformanceVo.class, KylinPerformanceVo.class.getSimpleName());