mongo查询固定条件提出来 演出状态判断提出来

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

@@ -118,7 +118,16 @@ public class KylinPerformancesServiceImpl extends ServiceImpl<KylinPerformancesM
             threeDaysList.add(info);
         }*/
         HashMap<String, Object> performancesListNotice = dataUtils.getPerformancesListNotice();
-        return performancesListNotice;
+        List<KylinPerformanceVo> toDayList = (List<KylinPerformanceVo>) performancesListNotice.get("toDayList");
+        List<KylinPerformanceVo> threeDaysList = (List<KylinPerformanceVo>) performancesListNotice.get("threeDaysList");
+
+        toDayList = checkAppStatus(toDayList);
+        threeDaysList = checkAppStatus(threeDaysList);
+
+        HashMap<String, Object> newList = new HashMap<>();
+        newList.put("toDayList", toDayList);
+        newList.put("threeDaysList", threeDaysList);
+        return newList;
     }
 
     public List<KylinPerformanceVo> recommendList() {
@@ -137,23 +146,11 @@ public class KylinPerformancesServiceImpl extends ServiceImpl<KylinPerformancesM
 
         KylinPerformanceVo performancesInfo = dataUtils.getPerformanceVo(performancesId);
 
-        // 处理状态 购买 未开始 结束可更改   下架 售馨不可更改
-        if (performancesInfo.getAppStatus() == 6 || performancesInfo.getAppStatus() == 9 || performancesInfo.getAppStatus() == 10) {
-            String stopSellTime = performancesInfo.getStopSellTime();
-            String sellTime = performancesInfo.getSellTime();
-            String nowTime = DateUtil.getNowTime();
+        List<KylinPerformanceVo> KylinPerformanceVoList = null;
+        KylinPerformanceVoList.add(performancesInfo);
+        KylinPerformanceVoList = checkAppStatus(KylinPerformanceVoList);
 
-            if (1 == DateUtil.compareStrDay(sellTime, nowTime)) {// 未开始
-                performancesInfo.setAppStatus(9);
-            } else { // 购买
-                performancesInfo.setAppStatus(6);
-            }
-            if (1 == DateUtil.compareStrDay(stopSellTime, nowTime)) { // 购买
-                performancesInfo.setAppStatus(6);
-            } else {// 已结束
-                performancesInfo.setAppStatus(10);
-            }
-        }
+        performancesInfo = KylinPerformanceVoList.get(0);
         performancesInfo.setMessage(KylinPerformanceStatusEnum.getName(performancesInfo.getAppStatus()));
 
         // 处理距离

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

@@ -500,11 +500,7 @@ public class DataUtils {
         String redisKey = KylinRedisConst.PERFORMANCES_LIST_CITYNAME.concat(cityName);
         if (!redisUtil.hasKey(redisKey)) {
             // 固定查询条件
-            Query query = new Query();
-            LocalDateTime nowTime = LocalDateTime.now();
-            String nowTimeStr = DateUtil.Formatter.yyyyMMddHHmmss.format(nowTime);
-            query.addCriteria(Criteria.where("timeEnd").gte(nowTimeStr));
-            query.addCriteria(Criteria.where("appStatus").in(3,6,8,9));
+            Query query = getCommonWhere();
             // 其他条件
             Pattern cityNameCompile = Pattern.compile("^.*" + cityName + ".*$", Pattern.CASE_INSENSITIVE);
             query.addCriteria(Criteria.where("cityName").regex(cityNameCompile));
@@ -529,11 +525,7 @@ public class DataUtils {
         String redisKey = KylinRedisConst.PERFORMANCES_LIST_SYSTEM_RECOMMEND;
         if (!redisUtil.hasKey(redisKey)) {
             // 固定条件
-            Query query = new Query();
-            LocalDateTime nowTime = LocalDateTime.now();
-            String nowTimeStr = DateUtil.Formatter.yyyyMMddHHmmss.format(nowTime);
-            query.addCriteria(Criteria.where("timeEnd").gte(nowTimeStr));
-            query.addCriteria(Criteria.where("appStatus").in(3,6,8,9));
+            Query query = getCommonWhere();
             // 排序
             Sort sortName = Sort.by(Sort.Direction.ASC, "timeStart");
             Pageable pageable = PageRequest.of(0, 8, sortName);
@@ -557,11 +549,7 @@ public class DataUtils {
         String redisKey = KylinRedisConst.PERFORMANCES_LIST_NOTICE;
         if (!redisUtil.hasKey(redisKey)) {
             // 固定条件
-            Query query = new Query();
-            LocalDateTime nowTime = LocalDateTime.now();
-            String nowTimeStr = nowTime.format(DateTimeFormatter.ofPattern("yyyy-MM-dd HH:mm:ss"));
-            query.addCriteria(Criteria.where("timeEnd").gte(nowTimeStr));
-            query.addCriteria(Criteria.where("appStatus").in(3,6,8,9));
+            Query query = getCommonWhere();
 
             // 今天的
             HashMap toDayTime = DateUtil.oneDayStartEnd();
@@ -575,10 +563,7 @@ public class DataUtils {
             List<KylinPerformanceVo> toDayList = mongoTemplate.find(query, KylinPerformanceVo.class, KylinPerformanceVo.class.getSimpleName());
 
             // 固定条件
-            Query queryT = new Query();
-            LocalDateTime nowTimeT = LocalDateTime.now();
-            String nowTimeStrT = nowTimeT.format(DateTimeFormatter.ofPattern("yyyy-MM-dd HH:mm:ss"));
-            queryT.addCriteria(Criteria.where("timeEnd").gte(nowTimeStrT));
+            Query queryT = getCommonWhere();
 
             // 三天的
             Calendar cal = Calendar.getInstance();
@@ -609,11 +594,7 @@ public class DataUtils {
         String redisKey = KylinRedisConst.PERFORMANCES_LIST_RECOMMEND;
         if (!redisUtil.hasKey(redisKey)) {
             // 固定条件
-            Query query = new Query();
-            LocalDateTime nowTime = LocalDateTime.now();
-            String nowTimeStr = DateUtil.Formatter.yyyyMMddHHmmss.format(nowTime);
-            query.addCriteria(Criteria.where("timeEnd").gte(nowTimeStr));
-            query.addCriteria(Criteria.where("appStatus").in(3,6,8,9));
+            Query query = getCommonWhere();
             // 排序
             Sort sortName = Sort.by(Sort.Direction.ASC, "timeStart");
             query.with(sortName);
@@ -637,11 +618,7 @@ public class DataUtils {
         String redisKey = KylinRedisConst.PERFORMANCES_LIST_EXCLUSIVE;
         if (!redisUtil.hasKey(redisKey)) {
             // 固定条件
-            Query query = new Query();
-            LocalDateTime nowTime = LocalDateTime.now();
-            String nowTimeStr = DateUtil.Formatter.yyyyMMddHHmmss.format(nowTime);
-            query.addCriteria(Criteria.where("timeEnd").gte(nowTimeStr));
-            query.addCriteria(Criteria.where("appStatus").in(3,6,8,9));
+            Query query = getCommonWhere();
             // 不要查询的字段
             query.fields().exclude("details");
             query.fields().exclude("noticeImage");
@@ -684,4 +661,18 @@ public class DataUtils {
         return (List<KylinPerformanceVo>) redisUtil.get(redisKey);
     }
 
+    /**
+     * 演出搜索固定参数
+     */
+    public Query getCommonWhere() {
+        // 固定条件
+        Query query = new Query();
+        LocalDateTime nowTime = LocalDateTime.now();
+        String nowTimeStr = DateUtil.Formatter.yyyyMMddHHmmss.format(nowTime);
+        query.addCriteria(Criteria.where("timeEnd").gte(nowTimeStr));
+        query.addCriteria(Criteria.where("appStatus").in(3,6,8,9));
+        query.addCriteria(Criteria.where("isShow").is(1));
+        return query;
+    }
+
 }