Merge remote-tracking branch 'origin/dev' into dev

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

@@ -975,10 +975,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) {
-                        orderTicketVo.setQrCode("");
-                    } else {
+                    if (DateUtil.compareDay(DateUtil.now(),date ) >= 0) {
                         orderTicketVo.setQrCode(orderTicketVo.getQrCode());
+                    } else {
+                        orderTicketVo.setQrCode("");
                     }
                 } else {
                     orderTicketVo.setQrCode("");