From 01830e44921b187b448d8cce9c9a46b9ad55af43 Mon Sep 17 00:00:00 2001
From: zj <1772600164@qq.com>
Date: Fri, 02 May 2025 19:48:32 +0800
Subject: [PATCH] Merge remote-tracking branch 'origin/bingx' into bingx

---
 src/main/java/project/futures/internal/FuturesOrderLocalServiceImpl.java |   12 ++++++------
 1 files changed, 6 insertions(+), 6 deletions(-)

diff --git a/src/main/java/project/futures/internal/FuturesOrderLocalServiceImpl.java b/src/main/java/project/futures/internal/FuturesOrderLocalServiceImpl.java
index 05cfaaa..d2b1fd0 100644
--- a/src/main/java/project/futures/internal/FuturesOrderLocalServiceImpl.java
+++ b/src/main/java/project/futures/internal/FuturesOrderLocalServiceImpl.java
@@ -2,9 +2,8 @@
 
 import java.math.RoundingMode;
 import java.text.DecimalFormat;
-import java.util.HashMap;
-import java.util.List;
-import java.util.Map;
+import java.text.SimpleDateFormat;
+import java.util.*;
 
 import org.springframework.jdbc.core.JdbcTemplate;
 
@@ -80,15 +79,16 @@
 		}
 		DecimalFormat df_symbol = new DecimalFormat(decimals);
 		df_symbol.setRoundingMode(RoundingMode.FLOOR);// 向下取整
-
+		SimpleDateFormat sdf = new SimpleDateFormat("yyyy-MM-dd HH:mm:ss");
+		sdf.setTimeZone(TimeZone.getTimeZone("Asia/Shanghai"));
 		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", DateUtils.format(order.getCreate_time(), DateUtils.DF_yyyyMMddHHmmss));
+		map.put("open_time", sdf.format(order.getCreate_time()));
 		if (order.getClose_time() != null) {
-			map.put("close_time", DateUtils.format(order.getClose_time(), DateUtils.DF_yyyyMMddHHmmss));
+			map.put("close_time", sdf.format(order.getClose_time()));
 		} else {
 			map.put("close_time", "--");
 		}

--
Gitblit v1.9.3