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

Commit cdce5fc6 authored by 胡佳晨's avatar 胡佳晨

是否 可退回

parent 0055367d
...@@ -173,8 +173,6 @@ public class KylinOrderTicketsServiceImpl implements IKylinOrderTicketsService { ...@@ -173,8 +173,6 @@ public class KylinOrderTicketsServiceImpl implements IKylinOrderTicketsService {
vo.setIsShowQrCode(0); vo.setIsShowQrCode(0);
vo.setShowQrCodeTime(""); vo.setShowQrCodeTime("");
} }
currentTime = System.currentTimeMillis() - currentTime;
// 数据脱敏 // 数据脱敏
for (KylinOrderTicketEntitiesVo item : kylinOrderTicketEntitiesVoList) { for (KylinOrderTicketEntitiesVo item : kylinOrderTicketEntitiesVoList) {
if (item.getEnterIdCode().length() == 18) { if (item.getEnterIdCode().length() == 18) {
...@@ -235,6 +233,7 @@ public class KylinOrderTicketsServiceImpl implements IKylinOrderTicketsService { ...@@ -235,6 +233,7 @@ public class KylinOrderTicketsServiceImpl implements IKylinOrderTicketsService {
orderRefundListVos.add(data); orderRefundListVos.add(data);
} }
//是否可退
if (null != performanceVo.getIsCanRefund() && performanceVo.getIsCanRefund() == 1) { if (null != performanceVo.getIsCanRefund() && performanceVo.getIsCanRefund() == 1) {
LocalDateTime refundOpenDate = DateUtil.Formatter.yyyyMMddHHmmss.parse(performanceVo.getRefundOpenTime()); LocalDateTime refundOpenDate = DateUtil.Formatter.yyyyMMddHHmmss.parse(performanceVo.getRefundOpenTime());
LocalDateTime refundCloseDate = DateUtil.Formatter.yyyyMMddHHmmss.parse(performanceVo.getRefundCloseTime()); LocalDateTime refundCloseDate = DateUtil.Formatter.yyyyMMddHHmmss.parse(performanceVo.getRefundCloseTime());
...@@ -249,7 +248,7 @@ public class KylinOrderTicketsServiceImpl implements IKylinOrderTicketsService { ...@@ -249,7 +248,7 @@ public class KylinOrderTicketsServiceImpl implements IKylinOrderTicketsService {
} else { } else {
vo.setIsCanRefund(0); vo.setIsCanRefund(0);
} }
//是否可转
if (null != performanceVo.getIsTransfer() && performanceVo.getIsTransfer() == 1) { if (null != performanceVo.getIsTransfer() && performanceVo.getIsTransfer() == 1) {
LocalDateTime transferStartTime = DateUtil.Formatter.yyyyMMddHHmmss.parse(performanceVo.getTransferStartTime()); LocalDateTime transferStartTime = DateUtil.Formatter.yyyyMMddHHmmss.parse(performanceVo.getTransferStartTime());
LocalDateTime transferEndTime = DateUtil.Formatter.yyyyMMddHHmmss.parse(performanceVo.getTransferEndTime()); LocalDateTime transferEndTime = DateUtil.Formatter.yyyyMMddHHmmss.parse(performanceVo.getTransferEndTime());
...@@ -263,6 +262,19 @@ public class KylinOrderTicketsServiceImpl implements IKylinOrderTicketsService { ...@@ -263,6 +262,19 @@ public class KylinOrderTicketsServiceImpl implements IKylinOrderTicketsService {
} else { } else {
vo.setIsCanTransfer(0); vo.setIsCanTransfer(0);
} }
//是否可回退
if (null != performanceVo.getIsCanRefund() && performanceVo.getIsCanRefund() == 1) {
LocalDateTime refundOpenDate = DateUtil.Formatter.yyyyMMddHHmmss.parse(performanceVo.getRefundOpenTime());
LocalDateTime refundCloseDate = DateUtil.Formatter.yyyyMMddHHmmss.parse(performanceVo.getRefundCloseTime());
if (LocalDateTime.now().isAfter(refundOpenDate) && LocalDateTime.now().isBefore(refundCloseDate)
&& orderTicketVo.getStatus().equals(3)) {
vo.setIsCanBack(1);
} else {
vo.setIsCanBack(0);
}
} else {
vo.setIsCanBack(0);
}
orderTicketVo.setOrderRefundListVos(orderRefundListVos); orderTicketVo.setOrderRefundListVos(orderRefundListVos);
if (orderTicketVo.getOrderCode().length() > 20) { if (orderTicketVo.getOrderCode().length() > 20) {
......
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