From d2847c8e9ee9296ee1f318abd2113275dd50f020 Mon Sep 17 00:00:00 2001
From: Helius <wangdoubleone@gmail.com>
Date: Fri, 21 May 2021 11:55:19 +0800
Subject: [PATCH] modify
---
src/main/java/com/xcong/excoin/modules/otc/service/impl/OtcOrderServiceImpl.java | 16 ++++++++++++----
1 files changed, 12 insertions(+), 4 deletions(-)
diff --git a/src/main/java/com/xcong/excoin/modules/otc/service/impl/OtcOrderServiceImpl.java b/src/main/java/com/xcong/excoin/modules/otc/service/impl/OtcOrderServiceImpl.java
index d2b0ddf..60f3660 100644
--- a/src/main/java/com/xcong/excoin/modules/otc/service/impl/OtcOrderServiceImpl.java
+++ b/src/main/java/com/xcong/excoin/modules/otc/service/impl/OtcOrderServiceImpl.java
@@ -272,7 +272,7 @@
buyDetail.setStatus(buyOrder.getStatus());
buyDetail.setTotalAmount(buyOrder.getTotalAmount());
buyDetail.setUnitPrice(buyOrder.getUnitPrice());
- buyDetail.setCreateTime(new Date());
+ buyDetail.setCreateTime(buyOrder.getCreateTime());
buyDetail.setIsMb(member.getIsTrader());
OtcOrder saleOrder = this.baseMapper.selectOrderByOrderNoAndType(otcOrder.getOrderNo(), OtcEntrustOrder.ORDER_TYPE_S);
@@ -292,8 +292,11 @@
buyDetail.setOrderCnt(otcMb.getBuyCnt());
}
- long between = DateUtil.between(buyOrder.getCreateTime(), new Date(), DateUnit.SECOND);
- buyDetail.setTimes(between);
+
+ if (OtcOrder.STATUS_SUBMIT.equals(buyOrder.getStatus())) {
+ long between = DateUtil.between(new Date(), DateUtil.offsetMinute(buyOrder.getCreateTime(), 30), DateUnit.SECOND, false);
+ buyDetail.setTimes(between);
+ }
return Result.ok(buyDetail);
}
@@ -317,7 +320,7 @@
saleDetail.setStatus(saleOrder.getStatus());
saleDetail.setTotalAmount(saleOrder.getTotalAmount());
saleDetail.setUnitPrice(saleOrder.getUnitPrice());
- saleDetail.setCreateTime(new Date());
+ saleDetail.setCreateTime(saleOrder.getCreateTime());
saleDetail.setIsMb(member.getIsTrader());
saleDetail.setPayName(saleOrder.getPayName());
@@ -328,6 +331,11 @@
saleDetail.setOrderCnt(otcMb.getBuyCnt());
}
+ if (OtcOrder.STATUS_SUBMIT.equals(saleOrder.getStatus())) {
+ long between = DateUtil.between(new Date(), DateUtil.offsetMinute(saleOrder.getCreateTime(), 30), DateUnit.SECOND, false);
+ saleDetail.setTimes(between);
+ }
+
return Result.ok(saleDetail);
}
--
Gitblit v1.9.1