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/exchange/internal/ExchangeApplyOrderServiceImpl.java | 15 ++++++---------
1 files changed, 6 insertions(+), 9 deletions(-)
diff --git a/src/main/java/project/exchange/internal/ExchangeApplyOrderServiceImpl.java b/src/main/java/project/exchange/internal/ExchangeApplyOrderServiceImpl.java
index ba39cd9..61cbdc0 100644
--- a/src/main/java/project/exchange/internal/ExchangeApplyOrderServiceImpl.java
+++ b/src/main/java/project/exchange/internal/ExchangeApplyOrderServiceImpl.java
@@ -1,12 +1,7 @@
package project.exchange.internal;
-import java.util.ArrayList;
-import java.util.Collections;
-import java.util.Comparator;
-import java.util.Date;
-import java.util.HashMap;
-import java.util.List;
-import java.util.Map;
+import java.text.SimpleDateFormat;
+import java.util.*;
import kernel.exception.BusinessException;
import kernel.util.Arith;
@@ -438,16 +433,18 @@
return bulidData(list);
}
}
-
private List<Map<String, Object>> entrustBulidData(List<ExchangeApplyOrder> list) {
List<Map<String, Object>> data = new ArrayList<Map<String, Object>>();
for (int i = 0; i < list.size(); i++) {
ExchangeApplyOrder order = list.get(i);
Map<String, Object> map = new HashMap<String, Object>();
+
+ SimpleDateFormat simpleDateFormat = new SimpleDateFormat("yyyy-MM-dd HH:mm:ss");
+ simpleDateFormat.setTimeZone(TimeZone.getTimeZone("Asia/Shanghai"));
map.put("order_no", order.getOrder_no());
map.put("name", itemService.cacheBySymbol(order.getSymbol(), false).getName());
map.put("symbol", order.getSymbol());
- map.put("create_time", DateUtils.format(order.getCreate_time(), DateUtils.DF_yyyyMMddHHmmss));
+ map.put("create_time", simpleDateFormat.format(order.getCreate_time()));
map.put("volume", order.getVolume());
map.put("offset", order.getOffset());
map.put("price", order.getPrice());
--
Gitblit v1.9.3