Merge remote-tracking branch 'origin/master' into jxl_0218_fields

liquidnet-bus-client/liquidnet-client-admin/liquidnet-client-admin-zhengzai/src/main/java/com/liquidnet/client/admin/zhengzai/kylin/service/impl/KylinPerformancesAdminServiceImpl.java

@@ -238,6 +238,9 @@ public class KylinPerformancesAdminServiceImpl extends ServiceImpl<KylinPerforma
             Map<String, Object> map = BeanUtil.convertBeanToMap(performanceAdminListParam);
             List<PerformanceAdminListDao> voList = performancesMapper.misPerformanceList(map);
             for (PerformanceAdminListDao item : voList) {
+                if (item.getTimeSell() == null || item.getTimeStop() == null) {
+                    continue;
+                }
                 item.setStatus(item.getStatus());
                 if (item.getStatus() >= 6 && item.getStatus() != 7) {
                     if (DateUtil.compareStrDay(item.getTimeSell(), DateUtil.getNowTime()) > 0) {//未开始

liquidnet-bus-common/liquidnet-common-cache/liquidnet-common-cache-redis/src/main/java/com.liquidnet.common.cache/redis/util/RedisUtil.java

@@ -34,7 +34,7 @@ public final class RedisUtil extends AbstractRedisUtil{
 
     public static void main(String[] args) {
         String[] keys = {
-                "stone:user:$uid::surplusGeneral",
+                "kylin:performances:id:879358616337735686573945",
                 "stone:item:logs:list:$uid"
         };
         for (String key : keys) {

liquidnet-bus-service/liquidnet-service-platform/liquidnet-service-platform-impl/src/main/java/com/liquidnet/service/platform/utils/PerformanceVoTask.java

@@ -336,6 +336,9 @@ public class PerformanceVoTask {
                         tickets.setTimeEndExpress(DateUtil.asLocalDateTime(new SimpleDateFormat("yyyy-MM-dd HH:mm:ss").parse(ticketItem.getTimeEndExpress())));
                         tickets.setDescribeExpress(ticketItem.getDescribeExpress());
                     }
+//                    else{
+//                        tickets.setTimeEndExpress(DateUtil.asLocalDateTime(new SimpleDateFormat("yyyy-MM-dd HH:mm:ss").parse("2030-01-01 12:00:00")));
+//                    }
                     if (ticketItem.getIsElectronic() == 1) {
                         tickets.setDescribeElectronic(ticketItem.getDescribeElectronic());
                     }

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());

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

@@ -210,7 +210,7 @@ public class KylinTicketTimesPartnerServiceImpl implements IKylinTicketTimesPart
             kylinTicketTimesPartnerVo.setStatus(null);
             mongoSlimeUtils.updateTicketTimesPartnerVo(kylinTicketTimesPartnerVo);
             KylinTicketPartnerVo ticketPartnerVo = KylinTicketPartnerVo.getNew();
-            ticketPartnerVo.setTicketsId(createTicketTimesParam.getTicketTimesId());
+            ticketPartnerVo.setTimesId(createTicketTimesParam.getTicketTimesId());
             ticketPartnerVo.setUseEnd(kylinTicketTimesPartnerVo.getUseEnd());
             ticketPartnerVo.setUseStart(kylinTicketTimesPartnerVo.getUseStart());
             mongoSlimeUtils.updateTicketPartnerVo(ticketPartnerVo);