From 6e85d12eab8accba3dd6731d9273388bd7f8d68c Mon Sep 17 00:00:00 2001
From: zyy <zyy@email.com>
Date: Fri, 14 Nov 2025 18:26:25 +0800
Subject: [PATCH] 2
---
trading-order-admin/src/main/java/com/yami/trading/admin/controller/user/UserDataController.java | 16 ++++++++++++++++
1 files changed, 16 insertions(+), 0 deletions(-)
diff --git a/trading-order-admin/src/main/java/com/yami/trading/admin/controller/user/UserDataController.java b/trading-order-admin/src/main/java/com/yami/trading/admin/controller/user/UserDataController.java
index 4750533..e416f4a 100644
--- a/trading-order-admin/src/main/java/com/yami/trading/admin/controller/user/UserDataController.java
+++ b/trading-order-admin/src/main/java/com/yami/trading/admin/controller/user/UserDataController.java
@@ -15,6 +15,8 @@
import com.yami.trading.common.constants.Constants;
import com.yami.trading.common.domain.Result;
import com.yami.trading.common.exception.YamiShopBindException;
+import com.yami.trading.common.util.DateUtil;
+import com.yami.trading.common.util.DateUtils;
import com.yami.trading.common.util.IPHelper;
import com.yami.trading.security.common.manager.PasswordManager;
import com.yami.trading.security.common.util.SecurityUtils;
@@ -30,7 +32,11 @@
import javax.validation.Valid;
import java.text.MessageFormat;
+import java.time.Instant;
+import java.time.ZoneId;
+import java.time.ZonedDateTime;
import java.util.ArrayList;
+import java.util.Date;
import java.util.List;
@RestController
@@ -80,6 +86,16 @@
userDataDto.setUserRegip(userDataDto.getUserLastip());
userDataDto.setUserLevel(userDataDto.getUserLevel() / 10);
+ if (userDataDto.getUserLasttime() != null) {
+ String time = DateUtil.convertToZonedDateTime(userDataDto.getUserLasttime());
+ Date toDate = DateUtil.stringToDate(time, "yyyy-MM-dd HH:mm:ss");
+ userDataDto.setUserLasttime(toDate);
+ }
+ if (userDataDto.getCreateTime() != null) {
+ String time = DateUtil.convertToZonedDateTime(userDataDto.getCreateTime());
+ Date toDate = DateUtil.stringToDate(time, "yyyy-MM-dd HH:mm:ss");
+ userDataDto.setCreateTime(toDate);
+ }
}
return Result.ok(page);
}
--
Gitblit v1.9.3