演出已结束或者未上线不展示

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

@@ -303,25 +303,30 @@ public class KylinPerformancesServiceImpl extends ServiceImpl<KylinPerformancesM
     }
 
     public List<KylinPerformanceVo> checkAppStatus(List<KylinPerformanceVo> list) {
+        List<KylinPerformanceVo> newList = new ArrayList<>();
         if (!CollectionUtils.isEmpty(list)) {
             String nowTimeStr = DateUtil.getNowTime();
             for (KylinPerformanceVo info : list) {
-                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);
+                Integer isEnd = DateUtil.compareStrDay(nowTimeStr, info.getTimeEnd());
+                if (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);
+                            }
                         }
                     }
+                    newList.add(info);
                 }
             }
         }
-        return list;
+        return newList;
     }
 
     public KylinPerformanceVo checkAppStatusInfo(KylinPerformanceVo info) {