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

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

是否 可退回

parent 11ca7c92
...@@ -116,14 +116,12 @@ public class KylinOrderTicketsServiceImpl implements IKylinOrderTicketsService { ...@@ -116,14 +116,12 @@ public class KylinOrderTicketsServiceImpl implements IKylinOrderTicketsService {
@Override @Override
public OrderDetailsVo orderDetails(String orderId) { public OrderDetailsVo orderDetails(String orderId) {
try { try {
Long currentTime = System.currentTimeMillis();
OrderDetailsVo vo = OrderDetailsVo.getNew(); OrderDetailsVo vo = OrderDetailsVo.getNew();
String uid = CurrentUtil.getCurrentUid(); String uid = CurrentUtil.getCurrentUid();
KylinOrderTicketVo orderTicketVo = dataUtils.getOrderTicketVo(orderId); KylinOrderTicketVo orderTicketVo = dataUtils.getOrderTicketVo(orderId);
if (orderTicketVo == null) { if (orderTicketVo == null) {
orderTicketVo = dataUtils.getTransferOrder(uid); orderTicketVo = dataUtils.getTransferOrder(uid);
} }
currentTime = System.currentTimeMillis() - currentTime;
if (uid.equals("809406") || uid.equals("773650")) { if (uid.equals("809406") || uid.equals("773650")) {
} else { } else {
if (!orderTicketVo.getUserId().equals(uid)) { if (!orderTicketVo.getUserId().equals(uid)) {
...@@ -132,7 +130,6 @@ public class KylinOrderTicketsServiceImpl implements IKylinOrderTicketsService { ...@@ -132,7 +130,6 @@ public class KylinOrderTicketsServiceImpl implements IKylinOrderTicketsService {
} }
if (null != orderTicketVo) { if (null != orderTicketVo) {
KylinPerformanceVo performanceVo = dataUtils.getPerformanceVo(orderTicketVo.getPerformanceId()); KylinPerformanceVo performanceVo = dataUtils.getPerformanceVo(orderTicketVo.getPerformanceId());
currentTime = System.currentTimeMillis() - currentTime;
List<KylinOrderTicketEntitiesVo> kylinOrderTicketEntitiesVoList = orderTicketVo.getEntitiesVoList(); List<KylinOrderTicketEntitiesVo> kylinOrderTicketEntitiesVoList = orderTicketVo.getEntitiesVoList();
KylinTicketVo ticketVo = null; KylinTicketVo ticketVo = null;
...@@ -147,8 +144,6 @@ public class KylinOrderTicketsServiceImpl implements IKylinOrderTicketsService { ...@@ -147,8 +144,6 @@ public class KylinOrderTicketsServiceImpl implements IKylinOrderTicketsService {
} }
} }
} }
currentTime = System.currentTimeMillis() - currentTime;
orderTicketVo.setIsTrueName(ticketVo.getIsTrueName()); orderTicketVo.setIsTrueName(ticketVo.getIsTrueName());
orderTicketVo.setNoticeImage(performanceVo.getNoticeImage()); orderTicketVo.setNoticeImage(performanceVo.getNoticeImage());
orderTicketVo.setNotice(performanceVo.getNotice()); orderTicketVo.setNotice(performanceVo.getNotice());
...@@ -267,7 +262,7 @@ public class KylinOrderTicketsServiceImpl implements IKylinOrderTicketsService { ...@@ -267,7 +262,7 @@ public class KylinOrderTicketsServiceImpl implements IKylinOrderTicketsService {
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());
if (LocalDateTime.now().isAfter(refundOpenDate) && LocalDateTime.now().isBefore(refundCloseDate) if (LocalDateTime.now().isAfter(refundOpenDate) && LocalDateTime.now().isBefore(refundCloseDate)
&& orderTicketVo.getStatus().equals(3)) { && orderTicketVo.getTransferStatus().equals(3)) {
vo.setIsCanBack(1); vo.setIsCanBack(1);
} else { } else {
vo.setIsCanBack(0); vo.setIsCanBack(0);
......
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