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

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

@@ -308,7 +308,28 @@ public class KylinPerformancesServiceImpl extends ServiceImpl<KylinPerformancesM
 
         List<KylinPerformanceVo> list = mongoTemplate.find(query, KylinPerformanceVo.class, KylinPerformanceVo.class.getSimpleName());
 
-        list = checkAppStatus(list);
+//        list = checkAppStatus(list);
+        if (!CollectionUtils.isEmpty(list)) {
+            String nowTimeStr = DateUtil.getNowTime();
+            for (KylinPerformanceVo info : list) {
+                Integer isEnd = DateUtil.compareStrDay(nowTimeStr, info.getTimeEnd());
+                if (7 != info.getAppStatus() && 3 != info.getAppStatus() && 1 != isEnd) { // 演出已结束或者未上线
+                    String timeStart = info.getSellTime();
+                    String timeEnd = info.getStopSellTime();
+
+                    if (info.getAppStatus() != 8) {
+                        if (1 == DateUtil.compareStrDay(timeStart, nowTimeStr)) {// 未开始
+                            info.setAppStatus(9);
+                        } else { // 已开始
+                            info.setAppStatus(6);
+                            if (1 == DateUtil.compareStrDay(nowTimeStr, timeEnd)) { // 已结束
+                                info.setAppStatus(10);
+                            }
+                        }
+                    }
+                }
+            }
+        }
 
         HashMap info = new HashMap();
         info.put("total", count);