From 5ab1a38d6fb2532b26311a4e2f9fd5120227a303 Mon Sep 17 00:00:00 2001
From: zj <1772600164@qq.com>
Date: Mon, 14 Jul 2025 21:03:13 +0800
Subject: [PATCH] 地址

---
 src/main/java/project/project/web/admin/AdminContractOrderController.java |   29 ++++++++++++++++++++++++-----
 1 files changed, 24 insertions(+), 5 deletions(-)

diff --git a/src/main/java/project/project/web/admin/AdminContractOrderController.java b/src/main/java/project/project/web/admin/AdminContractOrderController.java
index 41be9ab..d2941aa 100644
--- a/src/main/java/project/project/web/admin/AdminContractOrderController.java
+++ b/src/main/java/project/project/web/admin/AdminContractOrderController.java
@@ -3,11 +3,12 @@
 import java.math.BigDecimal;
 import java.text.DecimalFormat;
 import java.text.MessageFormat;
-import java.util.Date;
-import java.util.HashMap;
-import java.util.LinkedHashMap;
-import java.util.List;
-import java.util.Map;
+import java.text.SimpleDateFormat;
+import java.time.LocalDateTime;
+import java.time.ZoneId;
+import java.time.ZonedDateTime;
+import java.time.format.DateTimeFormatter;
+import java.util.*;
 
 import javax.servlet.http.HttpServletRequest;
 
@@ -116,7 +117,25 @@
 					String roleName = map.get("rolename").toString();
 					map.put("roleNameDesc", Constants.ROLE_MAP.containsKey(roleName) ? Constants.ROLE_MAP.get(roleName) : roleName);
 				}
+				Object createTimeObj = map.get("createTime");
+				ZonedDateTime berlinTime;
 
+				if (createTimeObj instanceof String) {
+					// 处理字符串格式 "2025-07-14T16:13:29" (ISO格式)
+					berlinTime = LocalDateTime.parse((String) createTimeObj)
+							.atZone(ZoneId.systemDefault())
+							.withZoneSameInstant(ZoneId.of("Europe/Berlin"));
+				} else if (createTimeObj instanceof LocalDateTime) {
+					// 处理 LocalDateTime 对象
+					berlinTime = ((LocalDateTime) createTimeObj)
+							.atZone(ZoneId.systemDefault())
+							.withZoneSameInstant(ZoneId.of("Europe/Berlin"));
+				} else {
+					throw new IllegalArgumentException("不支持的日期类型");
+				}
+
+				String formatted = berlinTime.format(DateTimeFormatter.ofPattern("yyyy-MM-dd HH:mm:ss"));
+				map.put("createTime", formatted);
 				double depositOpen =  Double.parseDouble(map.get("deposit_open").toString());
 				double leverRate = Double.parseDouble(map.get("lever_rate").toString());
 				double tradeAvgPrice =  Double.parseDouble(map.get("trade_avg_price").toString());

--
Gitblit v1.9.3