autumn/jsowell-charger-web
1
0
Fork 0
mirror of https://codeup.aliyun.com/67c68d4e484ca2f0a13ac3c1/ydc/jsowell-charger-web.git synced 2026-04-20 02:55:04 +08:00
Code Issues Packages Projects Releases Wiki Activity

update 可提现金额，减去当天申请金额

Browse Source
This commit is contained in:
Guoqs
2025-11-18 13:33:26 +08:00
parent 277fad8918
commit e778d34941
13 changed files with 2077 additions and 36 deletions
Download Patch File Download Diff File Expand all files Collapse all files

72
jsowell-common/src/main/java/com/jsowell/common/util/DateUtils.java
View File

@@ -15,6 +15,7 @@ import java.text.ParseException;
import java.text.SimpleDateFormat;
import java.time.*;
import java.time.format.DateTimeFormatter;
import java.time.format.DateTimeParseException;
import java.time.temporal.ChronoUnit;
import java.util.*;
@@ -53,6 +54,9 @@ public class DateUtils extends org.apache.commons.lang3.time.DateUtils {
"yyyy/MM/dd", "yyyy/MM/dd HH:mm:ss", "yyyy/MM/dd HH:mm", "yyyy/MM",
"yyyy.MM.dd", "yyyy.MM.dd HH:mm:ss", "yyyy.MM.dd HH:mm", "yyyy.MM"};
public static final DateTimeFormatter DEFAULT_DATE_TIME_FORMATTER =
DateTimeFormatter.ofPattern(YYYY_MM_DD_HH_MM_SS);
/**
* 获取当前Date型日期
*
@@ -251,10 +255,10 @@ public class DateUtils extends org.apache.commons.lang3.time.DateUtils {
*/
public static long minutesSince(String dateString) {
// 定义日期时间格式
DateTimeFormatter formatter = DateTimeFormatter.ofPattern("yyyy-MM-dd HH:mm:ss");
// DateTimeFormatter formatter = DateTimeFormatter.ofPattern("yyyy-MM-dd HH:mm:ss");
// 解析给定的日期字符串
LocalDateTime givenDateTime = LocalDateTime.parse(dateString, formatter);
LocalDateTime givenDateTime = LocalDateTime.parse(dateString, DEFAULT_DATE_TIME_FORMATTER);
// 获取当前时间
LocalDateTime now = LocalDateTime.now();
@@ -283,6 +287,12 @@ public class DateUtils extends org.apache.commons.lang3.time.DateUtils {
return Date.from(instant);
}
/**
* LocalDate转Date
*
* @param localDate
* @return
*/
public static Date localDate2Date(LocalDate localDate) {
if (localDate == null) {
return null;
@@ -393,8 +403,8 @@ public class DateUtils extends org.apache.commons.lang3.time.DateUtils {
// 判断是否包含时间部分
if (trimmed.contains(":")) {
// 包含时间部分，按完整日期时间格式解析
DateTimeFormatter formatter = DateTimeFormatter.ofPattern("yyyy-MM-dd HH:mm:ss");
return DateUtils.formatDateTime(LocalDateTime.parse(trimmed, formatter).toLocalDate().atStartOfDay());
// DateTimeFormatter formatter = DateTimeFormatter.ofPattern("yyyy-MM-dd HH:mm:ss");
return DateUtils.formatDateTime(LocalDateTime.parse(trimmed, DEFAULT_DATE_TIME_FORMATTER).toLocalDate().atStartOfDay());
} else {
// 不包含时间部分，按日期格式解析
DateTimeFormatter formatter = DateTimeFormatter.ofPattern("yyyy-MM-dd");
@@ -416,8 +426,8 @@ public class DateUtils extends org.apache.commons.lang3.time.DateUtils {
// 判断是否包含时间部分
if (trimmed.contains(":")) {
// 包含时间部分，按完整日期时间格式解析
DateTimeFormatter formatter = DateTimeFormatter.ofPattern("yyyy-MM-dd HH:mm:ss");
return DateUtils.formatDateTime(LocalDateTime.parse(trimmed, formatter).toLocalDate().atTime(LocalTime.MAX));
// DateTimeFormatter formatter = DateTimeFormatter.ofPattern("yyyy-MM-dd HH:mm:ss");
return DateUtils.formatDateTime(LocalDateTime.parse(trimmed, DEFAULT_DATE_TIME_FORMATTER).toLocalDate().atTime(LocalTime.MAX));
} else {
// 不包含时间部分，按日期格式解析
DateTimeFormatter formatter = DateTimeFormatter.ofPattern("yyyy-MM-dd");
@@ -425,6 +435,32 @@ public class DateUtils extends org.apache.commons.lang3.time.DateUtils {
}
}
/**
* 判断时间是否是今天
*
* @param dateTimeStr 日期时间字符串，格式为 "yyyy-MM-dd HH:mm:ss"
* @return
*/
public static boolean isToday(String dateTimeStr) {
// 判断入参 时间是否在 今天
if (dateTimeStr == null || dateTimeStr.trim().isEmpty()) {
return false;
}
try {
// DateTimeFormatter formatter = DateTimeFormatter.ofPattern("yyyy-MM-dd HH:mm:ss");
LocalDateTime dateTime = LocalDateTime.parse(dateTimeStr, DEFAULT_DATE_TIME_FORMATTER);
LocalDate date = dateTime.toLocalDate();
LocalDate today = LocalDate.now();
return date.isEqual(today);
} catch (DateTimeParseException e) {
// 如果解析失败，说明格式不正确
return false;
}
}
public enum IntervalType {
DAY,
HOUR,
@@ -632,6 +668,12 @@ public class DateUtils extends org.apache.commons.lang3.time.DateUtils {
return c.getTime();
}
/**
* 时间格式化
*
* @param date
* @return
*/
public static String formatDateTime(Date date) {
if (date == null) {
return "";
@@ -640,6 +682,11 @@ public class DateUtils extends org.apache.commons.lang3.time.DateUtils {
return simpleDateFormat.format(date);
}
/**
* 时间格式化
* @param localDateTime
* @return
*/
public static String formatDateTime(LocalDateTime localDateTime) {
if (localDateTime == null) {
return "";
@@ -648,6 +695,11 @@ public class DateUtils extends org.apache.commons.lang3.time.DateUtils {
return formatDateTime(date);
}
/**
* 时间格式化
* @param localTime
* @return
*/
public static String formatDateTime(LocalTime localTime) {
if (localTime == null) {
return "";
@@ -1239,7 +1291,7 @@ public class DateUtils extends org.apache.commons.lang3.time.DateUtils {
return LocalDateTime.of(
LocalDate.now(),
LocalTime.parse(timeStr, DateTimeFormatter.ofPattern("HH:mm")).withSecond(0)
).format(DateTimeFormatter.ofPattern("yyyy-MM-dd HH:mm:ss"));
).format(DEFAULT_DATE_TIME_FORMATTER);
}
@@ -1251,15 +1303,15 @@ public class DateUtils extends org.apache.commons.lang3.time.DateUtils {
public static String convertDateToDateTime(String dateStr) {
LocalDate endLocalDate = LocalDate.parse(dateStr);
LocalDateTime endLocalDateTime = endLocalDate.atStartOfDay();
return endLocalDateTime.format(DateTimeFormatter.ofPattern("yyyy-MM-dd HH:mm:ss"));
return endLocalDateTime.format(DEFAULT_DATE_TIME_FORMATTER);
}
public static String getEndTime(String dateStr) {
DateTimeFormatter inputFormatter = DateTimeFormatter.ofPattern("yyyy-MM-dd");
LocalDate date = LocalDate.parse(dateStr, inputFormatter);
LocalDateTime endTime = date.atTime(23, 59, 59);
DateTimeFormatter outputFormatter = DateTimeFormatter.ofPattern("yyyy-MM-dd HH:mm:ss");
return endTime.format(outputFormatter);
// DateTimeFormatter outputFormatter = DateTimeFormatter.ofPattern("yyyy-MM-dd HH:mm:ss");
return endTime.format(DEFAULT_DATE_TIME_FORMATTER);
}
}