|
@@ -456,7 +456,13 @@ public class WorkerLogic {
|
|
int month = DateUtil.month(startTime);
|
|
int month = DateUtil.month(startTime);
|
|
|
|
|
|
Mailbox mailbox = mailboxService.getById("1");
|
|
Mailbox mailbox = mailboxService.getById("1");
|
|
- Date endTime = DateUtil.parseDateTime(DateUtils.formatDate(new Date(),"yyyy-MM-dd") +" "+ mailbox.getSendTime()+":00");
|
|
|
|
|
|
+
|
|
|
|
+ // 1. 获取当前月份的最后一天
|
|
|
|
+ Date lastDayOfMonth = DateUtil.endOfMonth(new Date());
|
|
|
|
+ // 2. 将最后一天减1天,得到倒数第二天
|
|
|
|
+ Date secondLastDay = DateUtil.offsetDay(lastDayOfMonth, -1);
|
|
|
|
+
|
|
|
|
+ Date endTime = DateUtil.parseDateTime(DateUtils.formatDate(secondLastDay,"yyyy-MM-dd") +" "+ mailbox.getSendTime()+":00");
|
|
|
|
|
|
if (new Date().after(endTime) && DateUtil.offsetDay(startTime,2).month() != DateUtil.month(startTime)){
|
|
if (new Date().after(endTime) && DateUtil.offsetDay(startTime,2).month() != DateUtil.month(startTime)){
|
|
month = month+1;
|
|
month = month+1;
|