Merge branch 'pre' into 'master'

slime 过滤有问题演出

See merge request !173

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

@@ -756,6 +756,9 @@ public class KylinPerformancesPartnerServiceImpl implements IKylinPerformancesPa
                 List<PerformancePartnerListDao> voList = (List<PerformancePartnerListDao>) map.get("data");
                 for (int i = 0; i < voList.size(); i++) {
                     PerformancePartnerListDao vo = voList.get(i);
+                    if (vo.getTimeSell() == null || vo.getTimeStop() == null) {
+                        continue;
+                    }
                     vo.setSaleGeneral(vo.getNumber() - vo.getRefundNumber());
                     vo.setTotalSalePrice(vo.getPriceActual().subtract(vo.getPriceRefund()));
                     vo.setSurplusGeneral(vo.getTotalGeneral() - vo.getSaleGeneral());