Merge branch 'dev' into test

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

@@ -188,6 +188,7 @@ public class KylinPerformancesServiceImpl implements IKylinPerformancesService {
     }
 
     public HashMap<String, Object> ticketTimesPartner(String performancesId, Integer isAgent) {
+        log.info("000"+isAgent.toString());
         KylinPerformanceVo vo = dataUtils.getPerformanceVo(performancesId);
         vo = checkAppStatusInfo(vo);
 
@@ -196,18 +197,24 @@ public class KylinPerformancesServiceImpl implements IKylinPerformancesService {
             for (KylinTicketTimesVo partner : ticketTimesList) {
                 List<KylinTicketVo> ticketList = partner.getTicketList();
                 List<KylinTicketVo> ticketListNew = ObjectUtil.getKylinTicketVoArrayList();
+                log.info("for");
                 for (KylinTicketVo ticket : ticketList) {
+                    log.info("getTicketsId" + ticket.getTicketsId());
                     int status = checkTicketStatus(ticket);
                     ticket.setStatus(status);
                     // 会员状态
                     Integer isMemberStatus = getIsMemberStatus(ticket);
                     ticket.setIsMemberStatus(isMemberStatus);
                     if (null == isAgent || 0 == isAgent) {
+                        log.info("1111");
                         if (0 == ticket.getIsAgent()) {
+                            log.info("2222");
                             ticketListNew.add(ticket);
                         }
                     } else if (1 == isAgent) {
+                        log.info("3333");
                         if (1 == ticket.getIsAgent()) {
+                            log.info("4444");
                             ticketListNew.add(ticket);
                         }
                     }

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

@@ -347,8 +347,8 @@ public class DataImpl {
                             ticketStatus.setStatus(ticketData.getInt("status"));
                             ticketStatus.setCounts(1);
                             ticketStatus.setStatusExchange(7);
-                            ticketStatus.setIsShowCode(0);
-//                    ticketStatus.setQrCodeShowTime();
+                            ticketStatus.setIsShowCode(1);
+                            ticketStatus.setQrCodeShowTime(tickets.getCreatedAt());
                             ticketStatus.setIsLackRegister(ticketData.getInt("is_lack_register"));
                             ticketStatus.setTotalGeneral(ticketData.getInt("total_general"));
                             ticketStatus.setTotalExchange(ticketData.getInt("total_exchange"));
@@ -404,7 +404,7 @@ public class DataImpl {
                             ticketPartnerVo.setDescribeElectronic(tickets.getDescribeElectronic());
                             ticketPartnerVo.setStatus(ticketStatus.getStatus());
                             ticketPartnerVo.setIsShowCode(ticketStatus.getIsShowCode());
-//                        ticketPartnerVo.setQrCodeShowTime();
+                            ticketPartnerVo.setQrCodeShowTime(DateUtil.Formatter.yyyyMMddHHmmss.format(ticketStatus.getQrCodeShowTime()));
                             ticketPartnerVo.setTimesId(ticketRelations.getTimesId());
                             ticketPartnerVo.setIsLackRegister(ticketStatus.getIsLackRegister());
                             ticketPartnerVo.setSurplusGeneral(ticketStatus.getSurplusGeneral());