Merge branch 'dev' into test

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

@@ -231,9 +231,11 @@ public class KylinPerformancesPartnerServiceImpl extends ServiceImpl<KylinPerfor
             if (performanceStatus == null || performanceStatus.getStatus() == 0 || performanceStatus.getStatus() == 4) {
                 result = createStep2(step2Param);
                 log.info(" PERFORMANCE  演出第二步 创建(拒绝/撤回/第一次)");
-            } else if (performanceStatus.getStatus() == 1 || performanceStatus.getStatus() == 3 || performanceStatus.getStatus() == 6 || performanceStatus.getStatus() == 7 || performanceStatus.getStatus() == 8 || performanceStatus.getStatus() == 9 || performanceStatus.getStatus() == 10) {// 修改
+            } else if (performanceStatus.getStatus() == 1 || performanceStatus.getStatus() == 3 || performanceStatus.getStatus() == 6 || performanceStatus.getStatus() == 7 || performanceStatus.getStatus() == 8 || performanceStatus.getStatus() == 9 ) {// 修改
                 result = updateStep2(step2Param);
                 log.info(" PERFORMANCE  演出第二步 修改");
+            }else if(performanceStatus.getStatus() == 10){
+                result = ResponseDto.success("演出已结束不可修改");
             }
         }
         return result;

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

@@ -622,7 +622,7 @@ public class DataUtils {
         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,10));
+        query.addCriteria(Criteria.where("appStatus").in(6, 8, 9, 10));
         query.addCriteria(Criteria.where("isShow").is(1));
         return query;
     }