记得上下班打卡 | git大法好,push需谨慎

Commit 5bd894ac authored by 胡佳晨's avatar 胡佳晨

订单二维码相关

parent 2a3da7a7
...@@ -161,11 +161,17 @@ public class KylinOrderTicketsServiceImpl implements IKylinOrderTicketsService { ...@@ -161,11 +161,17 @@ public class KylinOrderTicketsServiceImpl implements IKylinOrderTicketsService {
LocalDateTime date = DateUtil.Formatter.yyyyMMddHHmmss.parse(ticketVo.getQrCodeShowTime()); LocalDateTime date = DateUtil.Formatter.yyyyMMddHHmmss.parse(ticketVo.getQrCodeShowTime());
if (LocalDateTime.now().isAfter(date)) { if (LocalDateTime.now().isAfter(date)) {
orderTicketVo.setQrCode(orderTicketVo.getQrCode()); orderTicketVo.setQrCode(orderTicketVo.getQrCode());
vo.setIsShowQrCode(ticketVo.getIsShowCode());
vo.setShowQrCodeTime(ticketVo.getQrCodeShowTime() == null ? "" : ticketVo.getQrCodeShowTime());
} else { } else {
orderTicketVo.setQrCode(""); orderTicketVo.setQrCode("");
vo.setIsShowQrCode(ticketVo.getIsShowCode());
vo.setShowQrCodeTime(ticketVo.getQrCodeShowTime() == null ? "" : ticketVo.getQrCodeShowTime());
} }
} else { } else {
orderTicketVo.setQrCode(""); orderTicketVo.setQrCode("");
vo.setIsShowQrCode(0);
vo.setShowQrCodeTime("");
} }
currentTime = System.currentTimeMillis() - currentTime; currentTime = System.currentTimeMillis() - currentTime;
...@@ -235,9 +241,6 @@ public class KylinOrderTicketsServiceImpl implements IKylinOrderTicketsService { ...@@ -235,9 +241,6 @@ public class KylinOrderTicketsServiceImpl implements IKylinOrderTicketsService {
if (orderTicketVo.getOrderCode().length() > 20) { if (orderTicketVo.getOrderCode().length() > 20) {
orderTicketVo.setOrderCode(orderTicketVo.getOrderCode().substring(orderTicketVo.getOrderCode().length() - 10)); orderTicketVo.setOrderCode(orderTicketVo.getOrderCode().substring(orderTicketVo.getOrderCode().length() - 10));
} }
vo.setIsShowQrCode(ticketVo.getIsShowCode());
vo.setShowQrCodeTime(ticketVo.getQrCodeShowTime() == null ? "" : ticketVo.getQrCodeShowTime());
vo.setOrderTicketVo(orderTicketVo); vo.setOrderTicketVo(orderTicketVo);
vo.setEnterDescribe(dataUtils.getEnterInfo(performanceVo.getType(), orderTicketVo.getGetTicketType(), orderTicketVo.getIsStudent(), ticketVo.getIsTrueName())); vo.setEnterDescribe(dataUtils.getEnterInfo(performanceVo.getType(), orderTicketVo.getGetTicketType(), orderTicketVo.getIsStudent(), ticketVo.getIsTrueName()));
} }
......
Markdown is supported
0% or
You are about to add 0 people to the discussion. Proceed with caution.
Finish editing this message first!
Please register or to comment