Merge branch 'dev' of http://gitlab.zhengzai.tv/dongjingwei/liquidnet-bus-v1 into dev

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

@@ -2,12 +2,10 @@ package com.liquidnet.service.kylin.service.impl;
 
 import com.baomidou.mybatisplus.extension.service.impl.ServiceImpl;
 import com.liquidnet.commons.lang.CommonConst;
-import com.liquidnet.commons.lang.util.CurrentUtil;
 import com.liquidnet.commons.lang.util.DateUtil;
 import com.liquidnet.commons.lang.util.DistanceUtil;
 import com.liquidnet.commons.lang.util.ServletUtils;
 import com.liquidnet.service.kylin.constant.KylinPerformanceStatusEnum;
-import com.liquidnet.service.kylin.dao.PerformanceOrderStatisticalDao;
 import com.liquidnet.service.kylin.dto.vo.middle.KylinTicketTimesVo;
 import com.liquidnet.service.kylin.dto.vo.middle.KylinTicketVo;
 import com.liquidnet.service.kylin.dto.vo.mongo.KylinPerformanceVo;
@@ -29,8 +27,6 @@ import org.springframework.data.mongodb.core.query.Query;
 import org.springframework.stereotype.Service;
 import org.springframework.util.CollectionUtils;
 
-import java.text.SimpleDateFormat;
-import java.time.LocalDateTime;
 import java.util.*;
 import java.util.regex.Pattern;
 import java.util.stream.Collectors;
@@ -150,8 +146,6 @@ public class KylinPerformancesServiceImpl extends ServiceImpl<KylinPerformancesM
             performancesInfo = checkAppStatusInfo(performancesInfo);
             performancesInfo.setMessage(KylinPerformanceStatusEnum.getName(performancesInfo.getAppStatus()));
         } catch (Exception e) {
-            e.printStackTrace();
-
             log.debug(" ERROR PERFORMANCE DETAILS AGENT : " +  ServletUtils.getRequest().getHeader("User-Agent"));
             log.debug(" ERROR PERFORMANCE DETAILS HOST : " +  ServletUtils.getRequest().getHeader("Host"));
             log.debug(" ERROR PERFORMANCE DETAILS PERFORMANCE_ID : " + performancesId);

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

@@ -548,7 +548,7 @@ public class DataUtils {
             // 固定条件
             Query query = getCommonWhere();
             // 排序
-            Sort sortName = Sort.by(Sort.Direction.ASC, "timeStart");
+            Sort sortName = Sort.by(Sort.Direction.DESC, "isRecommend");
             query.with(sortName);
             // 不要查询的字段
             query.fields().exclude("details");