From 51ee3c4db2eb49062d3236bf44f95dc22f8f6ac9 Mon Sep 17 00:00:00 2001
From: puhanshu <a9236326>
Date: 星期五, 14 一月 2022 17:59:03 +0800
Subject: [PATCH] 商业街bug修改
---
springcloud_k8s_panzhihuazhihuishequ/common/src/main/java/com/panzhihua/common/utlis/DateUtils.java | 53 +++++++++++++++++++++++++++++++++++++++++++++++++++++
1 files changed, 53 insertions(+), 0 deletions(-)
diff --git a/springcloud_k8s_panzhihuazhihuishequ/common/src/main/java/com/panzhihua/common/utlis/DateUtils.java b/springcloud_k8s_panzhihuazhihuishequ/common/src/main/java/com/panzhihua/common/utlis/DateUtils.java
index ccfbd91..32e88b0 100644
--- a/springcloud_k8s_panzhihuazhihuishequ/common/src/main/java/com/panzhihua/common/utlis/DateUtils.java
+++ b/springcloud_k8s_panzhihuazhihuishequ/common/src/main/java/com/panzhihua/common/utlis/DateUtils.java
@@ -4,8 +4,10 @@
import java.text.SimpleDateFormat;
import java.time.*;
import java.time.format.DateTimeFormatter;
+import java.util.ArrayList;
import java.util.Calendar;
import java.util.Date;
+import java.util.List;
import lombok.extern.slf4j.Slf4j;
@@ -23,6 +25,8 @@
public static DateTimeFormatter format_ymd_String = DateTimeFormatter.ofPattern("yyMMdd");
public static SimpleDateFormat yyyyMM_format = new SimpleDateFormat("yyyy-MM");
public static SimpleDateFormat format_yyymmdd = new SimpleDateFormat("yyyyMMdd");
+ public static SimpleDateFormat format_yyyy = new SimpleDateFormat("yyyy");
+ public static SimpleDateFormat format_yyyyMMddHHmmss = new SimpleDateFormat("yyyyMMddHHmmss");
private static DateTimeFormatter format_ymdhmssss = DateTimeFormatter.ofPattern("yyyy-MM-dd HH:mm:ss.SSS");
private static DateTimeFormatter format_ymds = DateTimeFormatter.ofPattern("yyyyMMdd");
private static DateTimeFormatter format_yms = DateTimeFormatter.ofPattern("yyyyMM");
@@ -815,6 +819,26 @@
}
/**
+ * 计算剩余天数，不足一天按一天算
+ * @param expireDate
+ * @return
+ */
+ public static int retrieveRemainingDays(Date expireDate) {
+ Date nowDate = new Date();
+ Calendar startDate = Calendar.getInstance();
+ startDate.setTime(nowDate);
+ Calendar endDate = Calendar.getInstance();
+ endDate.setTime(expireDate);
+ Calendar date = (Calendar) startDate.clone();
+ int daysBetween = 0;
+ while (date.before(endDate)) {
+ date.add(Calendar.DAY_OF_MONTH, 1);
+ daysBetween++;
+ }
+ return daysBetween;
+ }
+
+ /**
* 获取当前月第一天
*
* @return
@@ -844,6 +868,21 @@
// 格式化日期
SimpleDateFormat sdf = new SimpleDateFormat("yyyy-MM-dd");
return sdf.format(calendar.getTime()) + " 23:59:59";
+ }
+ /**
+ * 获取当前月最后一天
+ *
+ * @return
+ */
+ public static Date getLastDayOfMonth() {
+ Calendar calendar = Calendar.getInstance();
+
+ calendar.add(Calendar.MONTH, 1);
+
+ calendar.set(Calendar.DAY_OF_MONTH, 0);
+ // 格式化日期
+
+ return calendar.getTime();
}
/**
@@ -962,4 +1001,18 @@
String lastMonthEndTime = yyyyMMdd_format.format(lastMonthEndDateCal.getTime()) + " 23:59:59";
return stringToDateStandard(lastMonthEndTime);
}
+
+ /**
+ * 获取近20天日期
+ * @return 近20天日期
+ */
+ public static List<Date> getOldDays() {
+ List<Date> dates = new ArrayList<>();
+ Date date = new Date();
+ for (int i = 19; i >= 0; i--) {
+ Date date1 = DateUtils.addDay(date, -i);
+ dates.add(date1);
+ }
+ return dates;
+ }
}
--
Gitblit v1.7.1