Merge branch 'dev' into test

liquidnet-bus-client/liquidnet-client-admin/liquidnet-client-admin-zhengzai/src/main/java/com/liquidnet/client/admin/zhengzai/kylin/utils/PerformanceVoUtils.java

@@ -359,6 +359,7 @@ public class PerformanceVoUtils {
 
                         ticketsMapper.insert(tickets);
                         ticketStatus.setStatus(9);
+                        ticketStatus.setIsTrueName(performanceStatus.getIsTrueName());
                         ticketStatusMapper.insert(ticketStatus);
                         ticketRelationsMapper.insert(ticketRelations);
 

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

@@ -967,8 +967,10 @@ public class KylinOrderTicketsServiceImpl extends ServiceImpl<KylinOrderTicketsM
                 orderTicketVo.setFieldName(performanceVo.getFieldName());
                 if (ticketVo.getIsShowCode() == 1) {
                     Date date = DateUtil.parse(ticketVo.getQrCodeShowTime(), DateUtil.Formatter.yyyyMMddHHmm.toString());
-                    if (DateUtil.compareDay(date, DateUtil.now()) > 0) {
+                    if (DateUtil.compareDay(date, DateUtil.now()) <= 0) {
                         orderTicketVo.setQrCode("");
+                    }else{
+                        orderTicketVo.setQrCode(orderTicketVo.getQrCode());
                     }
                 } else {
                     orderTicketVo.setQrCode("");