From 9d641b6dd286bb9a817d9d4e42e36d4743a4bfd6 Mon Sep 17 00:00:00 2001
From: Helius <wangdoubleone@gmail.com>
Date: Fri, 21 May 2021 10:14:47 +0800
Subject: [PATCH] modify
---
src/main/java/com/xcong/excoin/modules/otc/service/impl/OtcOrderServiceImpl.java | 7 +++++--
src/test/java/com/xcong/excoin/KssframeworkApplicationTests.java | 9 +++++++++
2 files changed, 14 insertions(+), 2 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..fe46ce8 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
@@ -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);
}
diff --git a/src/test/java/com/xcong/excoin/KssframeworkApplicationTests.java b/src/test/java/com/xcong/excoin/KssframeworkApplicationTests.java
index d532e17..d0e63fb 100644
--- a/src/test/java/com/xcong/excoin/KssframeworkApplicationTests.java
+++ b/src/test/java/com/xcong/excoin/KssframeworkApplicationTests.java
@@ -1,5 +1,7 @@
package com.xcong.excoin;
+import cn.hutool.core.date.DateUnit;
+import cn.hutool.core.date.DateUtil;
import com.xcong.excoin.common.enumerates.CoinTypeEnum;
import com.xcong.excoin.common.enumerates.SymbolEnum;
import com.xcong.excoin.configurations.properties.AliOssProperties;
@@ -87,4 +89,11 @@
log.info("------>{}", list.get(0).getId());
}
+ @Test
+ public void dateUtilTest() {
+ Date date = DateUtil.offsetMinute(DateUtil.parse("2021-05-21 10:00:00", "yyyy-MM-dd HH:mm:ss"), 30);
+ System.out.println(DateUtil.offsetMinute(DateUtil.parse("2021-05-21 10:00:00", "yyyy-MM-dd HH:mm:ss"), 30));
+ System.out.println(DateUtil.between(date, new Date(), DateUnit.SECOND, false));
+ }
+
}
--
Gitblit v1.9.1