From b8b0683ebf3aedbca553a3365d05f5e602c94681 Mon Sep 17 00:00:00 2001
From: dd <gitluke@outlook.com>
Date: Thu, 06 Nov 2025 23:44:55 +0800
Subject: [PATCH] 1
---
src/main/java/com/nq/pojo/OrderEchoOut.java | 4 ++--
src/main/java/com/nq/pojo/UserWithdraw.java | 5 +++--
src/main/java/com/nq/service/impl/UserWithdrawServiceImpl.java | 14 ++++++++++----
src/main/java/com/nq/pojo/MoneyLog.java | 2 +-
src/main/java/com/nq/pojo/UserRecharge.java | 4 ++--
src/main/resources/mapper/UserMapper.xml | 7 ++++---
6 files changed, 22 insertions(+), 14 deletions(-)
diff --git a/src/main/java/com/nq/pojo/MoneyLog.java b/src/main/java/com/nq/pojo/MoneyLog.java
index 3c20b3f..c0e432d 100644
--- a/src/main/java/com/nq/pojo/MoneyLog.java
+++ b/src/main/java/com/nq/pojo/MoneyLog.java
@@ -20,7 +20,7 @@
private String accectType;
private String userId;
private String symbol;
- @JsonFormat(pattern = "yyyy-MM-dd HH:mm:ss", timezone = "Asia/Kolkata")
+ @JsonFormat(pattern = "yyyy-MM-dd HH:mm:ss", timezone = "America/New_York")
private Date createTime;
diff --git a/src/main/java/com/nq/pojo/OrderEchoOut.java b/src/main/java/com/nq/pojo/OrderEchoOut.java
index 7b8606f..93b7939 100644
--- a/src/main/java/com/nq/pojo/OrderEchoOut.java
+++ b/src/main/java/com/nq/pojo/OrderEchoOut.java
@@ -23,10 +23,10 @@
private String returnOfRate;
- @JsonFormat(pattern = "yyyy-MM-dd HH:mm:ss", timezone = "Asia/Kolkata")
+ @JsonFormat(pattern = "yyyy-MM-dd HH:mm:ss", timezone = "America/New_York")
private Date buyTime;
- @JsonFormat(pattern = "yyyy-MM-dd HH:mm:ss", timezone = "Asia/Kolkata")
+ @JsonFormat(pattern = "yyyy-MM-dd HH:mm:ss", timezone = "America/New_York")
private Date endTime;
diff --git a/src/main/java/com/nq/pojo/UserRecharge.java b/src/main/java/com/nq/pojo/UserRecharge.java
index 92b7e8c..1d640e0 100644
--- a/src/main/java/com/nq/pojo/UserRecharge.java
+++ b/src/main/java/com/nq/pojo/UserRecharge.java
@@ -39,9 +39,9 @@
private String orderDesc;
@Excel(name = "申请时间", databaseFormat = "yyyyMMddHHmmss", format = "yyyy-MM-dd HH:mm:ss")
- @JsonFormat(pattern = "yyyy-MM-dd HH:mm:ss" ,timezone = "Asia/Kolkata")
+ @JsonFormat(pattern = "yyyy-MM-dd HH:mm:ss" ,timezone = "America/New_York")
private Date addTime;
- @JsonFormat(pattern = "yyyy-MM-dd HH:mm:ss" ,timezone = "Asia/Kolkata")
+ @JsonFormat(pattern = "yyyy-MM-dd HH:mm:ss" ,timezone = "America/New_York")
@Excel(name = "支付时间", databaseFormat = "yyyyMMddHHmmss", format = "yyyy-MM-dd HH:mm:ss")
private Date payTime;
/*支付通道主键id*/
diff --git a/src/main/java/com/nq/pojo/UserWithdraw.java b/src/main/java/com/nq/pojo/UserWithdraw.java
index 22e5f9d..29c2982 100644
--- a/src/main/java/com/nq/pojo/UserWithdraw.java
+++ b/src/main/java/com/nq/pojo/UserWithdraw.java
@@ -22,10 +22,11 @@
private Integer agentId;
@Excel(name = "出金金额")
private BigDecimal withAmt;
- @JsonFormat(pattern = "yyyy-MM-dd HH:mm:ss", timezone = "Asia/Kolkata")
+ @JsonFormat(pattern = "yyyy-MM-dd HH:mm:ss", timezone = "America/New_York")
@Excel(name = "申请时间", databaseFormat = "yyyyMMddHHmmss", format = "yyyy-MM-dd HH:mm:ss")
private Date applyTime;
- @JsonFormat(pattern = "yyyy-MM-dd HH:mm:ss", timezone = "Asia/Kolkata")
+
+ @JsonFormat(pattern = "yyyy-MM-dd HH:mm:ss", timezone = "America/New_York")
@Excel(name = "出金时间", databaseFormat = "yyyyMMddHHmmss", format = "yyyy-MM-dd HH:mm:ss")
private Date transTime;
diff --git a/src/main/java/com/nq/service/impl/UserWithdrawServiceImpl.java b/src/main/java/com/nq/service/impl/UserWithdrawServiceImpl.java
index 08867e1..03a2bf4 100644
--- a/src/main/java/com/nq/service/impl/UserWithdrawServiceImpl.java
+++ b/src/main/java/com/nq/service/impl/UserWithdrawServiceImpl.java
@@ -186,20 +186,26 @@
*/
public static boolean isInTimeRange(String timeRange) {
try {
- // 分割开始时间和结束时间
String[] times = timeRange.split("-");
if (times.length != 2) {
throw new IllegalArgumentException("时间格式不正确，应为：HH:mm-HH:mm");
}
- // 解析时间
DateTimeFormatter formatter = DateTimeFormatter.ofPattern("H:mm");
LocalTime startTime = LocalTime.parse(times[0].trim(), formatter);
LocalTime endTime = LocalTime.parse(times[1].trim(), formatter);
LocalTime currentTime = LocalTime.now();
- // 判断是否在时间区间内
- return !currentTime.isBefore(startTime) && !currentTime.isAfter(endTime);
+ boolean isInRange;
+ if (endTime.isBefore(startTime)) {
+ // 跨天情况，将结束时间视为次日
+ isInRange = !currentTime.isBefore(startTime) || !currentTime.isAfter(endTime);
+ } else {
+ // 不跨天情况
+ isInRange = !currentTime.isBefore(startTime) && !currentTime.isAfter(endTime);
+ }
+
+ return isInRange;
} catch (Exception e) {
throw new IllegalArgumentException("时间解析错误，请检查格式是否正确", e);
diff --git a/src/main/resources/mapper/UserMapper.xml b/src/main/resources/mapper/UserMapper.xml
index 0211f5b..8ae0c4d 100644
--- a/src/main/resources/mapper/UserMapper.xml
+++ b/src/main/resources/mapper/UserMapper.xml
@@ -52,9 +52,10 @@
<include refid="Base_Column_List"/>
FROM user
<where>
- (agent_id = #{searchId} or
- agent_id in (select a.id FROM agent_user a left join agent_distribution_user d on a.id = d.agent_id WHERE d.parent_id = #{searchId})
- )
+ 1=1
+ <if test="searchId != null and searchId != '' ">
+ and agent_id = #{searchId}
+ </if>
<if test="realName != null and realName != '' ">
and real_name like CONCAT('%','${realName}','%')
</if>
--
Gitblit v1.9.3