统一演出状态

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

@@ -308,28 +308,36 @@ public class KylinPerformancesServiceImpl extends ServiceImpl<KylinPerformancesM
 
         List<KylinPerformanceVo> list = mongoTemplate.find(query, KylinPerformanceVo.class, KylinPerformanceVo.class.getSimpleName());
 
-//        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();
+                // 当前时间大于停售时间 小于结束时间 是 停售
+                String stopSellTime = info.getStopSellTime();
+                String timeEnd = info.getTimeEnd();
+                Integer isEnd = DateUtil.compareStrDay(nowTimeStr, timeEnd);
+                if (1 == DateUtil.compareStrDay(nowTimeStr, stopSellTime) && -1 == DateUtil.compareStrDay(nowTimeStr, timeEnd)) {
+                    info.setAppStatus(11);
+                }
 
-                    if (info.getAppStatus() != 8) {
-                        if (1 == DateUtil.compareStrDay(timeStart, nowTimeStr)) {// 未开始
+                // 票状态 6票可购买 8售罄 9未开始 10结束 11停售
+                if (info.getAppStatus() != 8 && info.getAppStatus() != 11 && 7 != info.getAppStatus() && 1 != isEnd) { // 个别状态无需再判断
+                    String sellTime = info.getSellTime();
+                    if (1 == DateUtil.compareStrDay(sellTime, nowTimeStr)) {// 未开始
                         info.setAppStatus(9);
+                        int isMemberStatus = getPerformanceIsMemberStatus(info);
+                        if (1 == isMemberStatus) {
+                            info.setAppStatus(6);
+                        }
                     } else { // 已开始
                         info.setAppStatus(6);
-                            if (1 == DateUtil.compareStrDay(nowTimeStr, timeEnd)) { // 已结束
+                        if (1 == DateUtil.compareStrDay(nowTimeStr, timeEnd)) { // 演出已结束
                             info.setAppStatus(10);
                         }
                     }
                 }
             }
         }
-        }
 
         HashMap info = new HashMap();
         info.put("total", count);
@@ -372,21 +380,29 @@ public class KylinPerformancesServiceImpl extends ServiceImpl<KylinPerformancesM
         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();
+                // 当前时间大于停售时间 小于结束时间 是 停售
+                String stopSellTime = info.getStopSellTime();
+                String timeEnd = info.getTimeEnd();
+                Integer isEnd = DateUtil.compareStrDay(nowTimeStr, timeEnd);
+                if (1 == DateUtil.compareStrDay(nowTimeStr, stopSellTime) && -1 == DateUtil.compareStrDay(nowTimeStr, timeEnd)) {
+                    info.setAppStatus(11);
+                }
 
-                    if (info.getAppStatus() != 8) {
-                        if (1 == DateUtil.compareStrDay(timeStart, nowTimeStr)) {// 未开始
+                // 票状态 6票可购买 8售罄 9未开始 10结束 11停售
+                if (7 != info.getAppStatus() && 1 != isEnd) { // 演出已结束、未上线 不展示
+                    String sellTime = info.getSellTime();
+                    if (1 == DateUtil.compareStrDay(sellTime, nowTimeStr)) {// 未开始
                         info.setAppStatus(9);
+                        int isMemberStatus = getPerformanceIsMemberStatus(info);
+                        if (1 == isMemberStatus) {
+                            info.setAppStatus(6);
+                        }
                     } else { // 已开始
                         info.setAppStatus(6);
-                            if (1 == DateUtil.compareStrDay(nowTimeStr, timeEnd)) { // 已结束
+                        if (1 == DateUtil.compareStrDay(nowTimeStr, timeEnd)) { // 演出已结束
                             info.setAppStatus(10);
                         }
                     }
-                    }
                     newList.add(info);
                 }
             }
@@ -417,22 +433,20 @@ public class KylinPerformancesServiceImpl extends ServiceImpl<KylinPerformancesM
                 }
             }
             info.setTicketTimeList(ticketTimeListNew);
-            if (CollectionUtils.isEmpty(ticketTimeListNew)) {
+
+            if (CollectionUtils.isEmpty(ticketTimeListNew)) { //列表的时候无需判断 因为列表不展示状态标签
                 info.setAppStatus(11); // 所有票种下架 演出停售
             }
-
             // 当前时间大于停售时间 小于结束时间 是 停售
             String nowTimeStr = DateUtil.getNowTime();
             String stopSellTime = info.getStopSellTime();
-
             String timeEnd = info.getTimeEnd();
             if (1 == DateUtil.compareStrDay(nowTimeStr, stopSellTime) && -1 == DateUtil.compareStrDay(nowTimeStr, timeEnd)) {
                 info.setAppStatus(11);
             }
 
             // 票状态 6票可购买 8售罄 9未开始 10结束 11停售
-            // 演出状态 7下架前端不展示
-            if (info.getAppStatus() != 8 && info.getAppStatus() != 11 && 7 != info.getAppStatus()) {
+            if (info.getAppStatus() != 8 && info.getAppStatus() != 11 && 7 != info.getAppStatus()) { // 个别状态无需再判断
                 String sellTime = info.getSellTime();
                 if (1 == DateUtil.compareStrDay(sellTime, nowTimeStr)) {// 未开始
                     info.setAppStatus(9);