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/contract/internal/ContractOrderServiceImpl.java | 12 ++++++++----
1 files changed, 8 insertions(+), 4 deletions(-)
diff --git a/src/main/java/project/contract/internal/ContractOrderServiceImpl.java b/src/main/java/project/contract/internal/ContractOrderServiceImpl.java
index 64965b0..ab32bc6 100644
--- a/src/main/java/project/contract/internal/ContractOrderServiceImpl.java
+++ b/src/main/java/project/contract/internal/ContractOrderServiceImpl.java
@@ -429,8 +429,11 @@
if (!StringUtils.isNullOrEmpty(endTime)) {
whereSql.append("AND DATE(CREATE_TIME)<=DATE('"+endTime+" 23:59:59') ");
}
-
- whereSql.append("ORDER BY CREATE_TIME DESC LIMIT ?,?");
+ if ("orders".equals(type)) {
+ whereSql.append("ORDER BY CREATE_TIME DESC LIMIT ?,?");
+ } else if ("hisorders".equals(type)) {
+ whereSql.append("ORDER BY CLOSE_TIME DESC LIMIT ?,?");
+ }
params.add(page.getFirstElementNumber());
params.add(pageSize);
@@ -478,8 +481,9 @@
}
public Map<String, Object> bulidOne(ContractOrder order) {
- SimpleDateFormat simpleDateFormat = new SimpleDateFormat("yyyy-MM-dd hh:mm:ss a", Locale.ENGLISH);
- simpleDateFormat.setTimeZone(TimeZone.getTimeZone("America/New_York"));
+// SimpleDateFormat simpleDateFormat = new SimpleDateFormat("yyyy-MM-dd hh:mm:ss a", Locale.ENGLISH);
+ SimpleDateFormat simpleDateFormat = new SimpleDateFormat("yyyy-MM-dd HH:mm:ss");
+ simpleDateFormat.setTimeZone(TimeZone.getTimeZone("Europe/Berlin"));
DecimalFormat df = new DecimalFormat("#.##");
Map<String, Object> map = new HashMap<String, Object>();
map.put("order_no", order.getOrder_no());
--
Gitblit v1.9.3