|
@@ -566,15 +566,16 @@ public class AgreementLogic {
|
|
|
|
|
|
|
|
|
Mailbox mailbox = mailboxService.getById("1");
|
|
|
+ Date date = new Date();
|
|
|
|
|
|
//今天要发送的保单
|
|
|
- Date endTime = DateUtil.parseDateTime(DateUtils.formatDate(new Date(),"yyyy-MM-dd") +" "+ mailbox.getSendTime()+":00");
|
|
|
- if(new Date().getTime() < endTime.getTime()){
|
|
|
+ Date endTime = DateUtil.parseDateTime(DateUtils.formatDate(date,"yyyy-MM-dd") +" "+ mailbox.getSendTime()+":00");
|
|
|
+ if(date.getTime() < endTime.getTime()){
|
|
|
//还没到可发邮件的时间
|
|
|
return;
|
|
|
}
|
|
|
|
|
|
- if (mailboxSendRecordService.lambdaQuery().gt(MailboxSendRecord::getSendTime, DateUtil.beginOfDay(new Date())).count() > 0) {
|
|
|
+ if (mailboxSendRecordService.lambdaQuery().gt(MailboxSendRecord::getSendTime, DateUtil.beginOfDay(date)).count() > 0) {
|
|
|
return;
|
|
|
}
|
|
|
|
|
@@ -1099,16 +1100,16 @@ public class AgreementLogic {
|
|
|
|
|
|
|
|
|
Mailbox mailbox = mailboxService.getById("1");
|
|
|
-
|
|
|
+ Date date = new Date();
|
|
|
//今天要发送的保单
|
|
|
//Date startTime = DateUtil.beginOfDay(new Date());
|
|
|
- Date endTime = DateUtil.parseDateTime(DateUtils.formatDate(new Date(),"yyyy-MM-dd") +" "+ mailbox.getSendTime()+":00");
|
|
|
- if(new Date().getTime() < endTime.getTime()){
|
|
|
+ Date endTime = DateUtil.parseDateTime(DateUtils.formatDate(date,"yyyy-MM-dd") +" "+ mailbox.getSendTime()+":00");
|
|
|
+ if(date.getTime() < endTime.getTime()){
|
|
|
//还没到可发邮件的时间
|
|
|
return;
|
|
|
}
|
|
|
|
|
|
- if (mailboxSendRecordService.lambdaQuery().gt(MailboxSendRecord::getSendTime, DateUtil.beginOfDay(new Date())).count() > 0) {
|
|
|
+ if (mailboxSendRecordService.lambdaQuery().gt(MailboxSendRecord::getSendTime, DateUtil.beginOfDay(date)).count() > 0) {
|
|
|
return;
|
|
|
}
|
|
|
|
|
@@ -1290,16 +1291,16 @@ public class AgreementLogic {
|
|
|
public void sendEmailScheIN() {
|
|
|
|
|
|
Mailbox mailbox = mailboxService.getById("1");
|
|
|
-
|
|
|
+ Date date = new Date();
|
|
|
//今天要发送的保单
|
|
|
//Date startTime = DateUtil.beginOfDay(new Date());
|
|
|
- Date endTime = DateUtil.parseDateTime(DateUtils.formatDate(new Date(),"yyyy-MM-dd") +" "+ mailbox.getSendTime()+":00");
|
|
|
- if(new Date().getTime() < endTime.getTime()){
|
|
|
+ Date endTime = DateUtil.parseDateTime(DateUtils.formatDate(date,"yyyy-MM-dd") +" "+ mailbox.getSendTime()+":00");
|
|
|
+ if(date.getTime() < endTime.getTime()){
|
|
|
//还没到可发邮件的时间
|
|
|
return;
|
|
|
}
|
|
|
|
|
|
- if (mailboxSendRecordService.lambdaQuery().gt(MailboxSendRecord::getSendTime, DateUtil.beginOfDay(new Date())).count() > 0) {
|
|
|
+ if (mailboxSendRecordService.lambdaQuery().gt(MailboxSendRecord::getSendTime, DateUtil.beginOfDay(date)).count() > 0) {
|
|
|
return;
|
|
|
}
|
|
|
|