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

Commit 74a023d6 authored by 胡佳晨's avatar 胡佳晨

转赠订单详情逻辑

parent 2fe793f7
...@@ -120,6 +120,9 @@ public class KylinOrderTicketsServiceImpl implements IKylinOrderTicketsService { ...@@ -120,6 +120,9 @@ public class KylinOrderTicketsServiceImpl implements IKylinOrderTicketsService {
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) {
orderTicketVo = dataUtils.getTransferOrder(uid);
}
currentTime = System.currentTimeMillis() - currentTime; currentTime = System.currentTimeMillis() - currentTime;
if (uid.equals("809406") || uid.equals("773650")) { if (uid.equals("809406") || uid.equals("773650")) {
} else { } else {
...@@ -199,8 +202,8 @@ public class KylinOrderTicketsServiceImpl implements IKylinOrderTicketsService { ...@@ -199,8 +202,8 @@ public class KylinOrderTicketsServiceImpl implements IKylinOrderTicketsService {
if (orderTicketVo.getTransferTime() != null && (orderTicketVo.getTransferStatus().equals(1) || orderTicketVo.getTransferStatus().equals(4))) { if (orderTicketVo.getTransferTime() != null && (orderTicketVo.getTransferStatus().equals(1) || orderTicketVo.getTransferStatus().equals(4))) {
vo.setRestTransferTime(DateUtil.intervalSeconds( vo.setRestTransferTime(DateUtil.intervalSeconds(
DateUtil.parse(DateUtil.Formatter.yyyyMMddHHmmss.format(LocalDateTime.parse(orderTicketVo.getTransferTime(), DateTimeFormatter.ofPattern("yyyy-MM-dd HH:mm:ss")).plusMinutes(120)), DateUtil.parse(DateUtil.Formatter.yyyyMMddHHmmss.format(LocalDateTime.parse(orderTicketVo.getTransferTime(), DateTimeFormatter.ofPattern("yyyy-MM-dd HH:mm:ss")).plusMinutes(120)),
"yyyy-MM-dd HH:mm:ss"), "yyyy-MM-dd HH:mm:ss"),
nowDate nowDate
)); ));
if (vo.getRestTransferTime() <= 0L) { if (vo.getRestTransferTime() <= 0L) {
vo.setRestTransferTime(0L); vo.setRestTransferTime(0L);
......
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