From 9102aa7e0b42ce5b9667fa3b67fede889df60fc0 Mon Sep 17 00:00:00 2001
From: zj <1772600164@qq.com>
Date: Fri, 02 May 2025 20:08:00 +0800
Subject: [PATCH] /

---
 src/main/java/project/futures/internal/FuturesOrderServiceImpl.java |   11 ++++++++---
 1 files changed, 8 insertions(+), 3 deletions(-)

diff --git a/src/main/java/project/futures/internal/FuturesOrderServiceImpl.java b/src/main/java/project/futures/internal/FuturesOrderServiceImpl.java
index c3ee262..9d62e54 100644
--- a/src/main/java/project/futures/internal/FuturesOrderServiceImpl.java
+++ b/src/main/java/project/futures/internal/FuturesOrderServiceImpl.java
@@ -578,14 +578,19 @@
 		DecimalFormat df_symbol = new DecimalFormat(decimals);
 		df_symbol.setRoundingMode(RoundingMode.FLOOR);// 向下取整
 
+		SimpleDateFormat sdf = new SimpleDateFormat("yyyy-MM-dd hh:mm:ss");
+		TimeZone timeZone = TimeZone.getTimeZone("America/New_York");
+		sdf.setTimeZone(timeZone);
+
 		DecimalFormat df = new DecimalFormat("#.##");
 		Map<String, Object> map = new HashMap<String, Object>();
 		map.put("order_no", order.getOrder_no());
 		map.put("name", item.getName());
 		map.put("symbol", order.getSymbol());
-		map.put("open_time", simpleDateFormat.format(order.getCreate_time()));
+		map.put("open_time", sdf.format(order.getCreate_time()));
 		if (order.getClose_time() != null) {
-			map.put("close_time", DateUtils.format(order.getClose_time(), "yyyy-MM-dd  hh:mm:ss"));
+			// 设置时区为纽约的冬令时(Eastern Standard Time, EST)
+			map.put("close_time", sdf.format(order.getClose_time()));
 		} else {
 			map.put("close_time", "--");
 		}
@@ -606,7 +611,7 @@
 		}
 
 		map.put("volume", order.getVolume());
-		map.put("settlement_time", simpleDateFormat.format(order.getSettlement_time()));// 交割时间
+		map.put("settlement_time", sdf.format(order.getSettlement_time()));// 交割时间
 		map.put("close_price", df_symbol.format(order.getClose_avg_price()));
 		map.put("remain_time", StringUtils.isEmptyString(order.getRemain_time()) ? "0:0:0" : order.getRemain_time());
 		map.put("time_num", order.getTimeNum());

--
Gitblit v1.9.3