From a8bc04c1c9270a2a7f28d6113bc6f097496c50aa Mon Sep 17 00:00:00 2001
From: Helius <wangdoubleone@gmail.com>
Date: Mon, 01 Mar 2021 14:40:25 +0800
Subject: [PATCH] Merge branch 'whole_new' of http://120.27.238.55:7000/r/exchange into whole_new
---
src/main/java/com/xcong/excoin/modules/documentary/vo/HistoryOrderRecordsVo.java | 3 +++
src/main/java/com/xcong/excoin/modules/documentary/service/impl/DocumentaryServiceImpl.java | 3 ++-
2 files changed, 5 insertions(+), 1 deletions(-)
diff --git a/src/main/java/com/xcong/excoin/modules/documentary/service/impl/DocumentaryServiceImpl.java b/src/main/java/com/xcong/excoin/modules/documentary/service/impl/DocumentaryServiceImpl.java
index de44524..f77b3a2 100644
--- a/src/main/java/com/xcong/excoin/modules/documentary/service/impl/DocumentaryServiceImpl.java
+++ b/src/main/java/com/xcong/excoin/modules/documentary/service/impl/DocumentaryServiceImpl.java
@@ -221,7 +221,8 @@
historyOrderRecordsVo.setClosingPrice(closingPrice);
BigDecimal openingPrice = historyOrderRecordsVo.getOpeningPrice().setScale(2, BigDecimal.ROUND_DOWN);
historyOrderRecordsVo.setOpeningPrice(openingPrice);
- }
+ historyOrderRecordsVo.setClosingTimeStamp(historyOrderRecordsVo.getClosingTime().getTime());
+ }
}
return Result.ok(historyOrderRecordsVoList);
}
diff --git a/src/main/java/com/xcong/excoin/modules/documentary/vo/HistoryOrderRecordsVo.java b/src/main/java/com/xcong/excoin/modules/documentary/vo/HistoryOrderRecordsVo.java
index 8836574..2d8bd94 100644
--- a/src/main/java/com/xcong/excoin/modules/documentary/vo/HistoryOrderRecordsVo.java
+++ b/src/main/java/com/xcong/excoin/modules/documentary/vo/HistoryOrderRecordsVo.java
@@ -38,6 +38,9 @@
@JsonFormat(pattern = "yyyy-MM-dd HH:mm:ss", timezone = "GMT+8")
@ApiModelProperty("平仓时间")
private Date closingTime;
+
+ @ApiModelProperty("平仓时间时间戳")
+ private long closingTimeStamp;
@ApiModelProperty("订单编号")
private String orderNo;
--
Gitblit v1.9.1