Merge branch 'pre' into 'master'

注释 pvuv

See merge request !230

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

@@ -251,7 +251,7 @@ public class KylinPerformancesServiceImpl implements IKylinPerformancesService {
             return null;
         }
         vo = checkAppStatusInfo(vo);
-        queueUtils.pushPvUv(CurrentUtil.getCurrentUid(), KylinTableStatusConst.PvUv.TK_TICKET.getKey(), performancesId, null, null, CurrentUtil.getCliIpAddr());
+//        queueUtils.pushPvUv(CurrentUtil.getCurrentUid(), KylinTableStatusConst.PvUv.TK_TICKET.getKey(), performancesId, null, null, CurrentUtil.getCliIpAddr());
         List<KylinTicketTimesVo> ticketTimesList = vo.getTicketTimeList();
         if (null != ticketTimesList) {
 
@@ -423,7 +423,7 @@ public class KylinPerformancesServiceImpl implements IKylinPerformancesService {
             return null;
         }
         performancesInfo = checkAppStatusInfo(performancesInfo);
-        queueUtils.pushPvUv(CurrentUtil.getCurrentUid(), KylinTableStatusConst.PvUv.TK_ORDER.getKey(), performancesId, null, null, CurrentUtil.getCliIpAddr());
+//        queueUtils.pushPvUv(CurrentUtil.getCurrentUid(), KylinTableStatusConst.PvUv.TK_ORDER.getKey(), performancesId, null, null, CurrentUtil.getCliIpAddr());
         for (int i = 0; i < performancesInfo.getTicketTimeList().size(); i++) {
             for (int x = 0; x < performancesInfo.getTicketTimeList().get(i).getTicketList().size(); x++) {
                 KylinTicketVo ticketItem = performancesInfo.getTicketTimeList().get(i).getTicketList().get(x);

liquidnet-bus-service/liquidnet-service-order/liquidnet-service-order-impl/src/main/java/com/liquidnet/service/order/service/impl/KylinOrderTicketsServiceImpl.java

@@ -97,7 +97,7 @@ public class KylinOrderTicketsServiceImpl implements IKylinOrderTicketsOrderServ
         try {
             String orderTicketId = IDGenerator.nextSnowId();
             String orderCode = IDGenerator.ticketOrderCode(orderTicketId);
-            queueUtils.pushPvUv(uid, KylinTableStatusConst.PvUv.TK_PAY.getKey(), payOrderParam.getPerformanceId(), orderTicketId, orderCode, CurrentUtil.getCliIpAddr());
+//            queueUtils.pushPvUv(uid, KylinTableStatusConst.PvUv.TK_PAY.getKey(), payOrderParam.getPerformanceId(), orderTicketId, orderCode, CurrentUtil.getCliIpAddr());
             if (payOrderParam.getVoucherType() != null && payOrderParam.getVoucherType().equals(3)) {
                 isPay = false;
                 if (payOrderParam.getNumber() > 1) {