|
@@ -1024,6 +1024,9 @@ public class MarketEmailsServiceImpl extends MyBaseServiceImpl<MarketEmailsMappe
|
|
|
return;
|
|
return;
|
|
|
}
|
|
}
|
|
|
for (MarketingCampaignEntity marketingCampaignEntity : marketingCampaignList) {
|
|
for (MarketingCampaignEntity marketingCampaignEntity : marketingCampaignList) {
|
|
|
|
|
+ if (marketingCampaignEntity.getId().equals(43L)){
|
|
|
|
|
+ log.info("测试");
|
|
|
|
|
+ }
|
|
|
//查询自动化设置的未跟进天数
|
|
//查询自动化设置的未跟进天数
|
|
|
Integer followUpDays = marketingCampaignEntity.getFollowUpRulesNotOpenedDays();
|
|
Integer followUpDays = marketingCampaignEntity.getFollowUpRulesNotOpenedDays();
|
|
|
LocalDateTime now = LocalDateTime.now();
|
|
LocalDateTime now = LocalDateTime.now();
|
|
@@ -1046,7 +1049,7 @@ public class MarketEmailsServiceImpl extends MyBaseServiceImpl<MarketEmailsMappe
|
|
|
List<MarketEmailsEntity> marketEmailList = this.list(queryWrapper);
|
|
List<MarketEmailsEntity> marketEmailList = this.list(queryWrapper);
|
|
|
|
|
|
|
|
if (CollectionUtils.isEmpty(marketEmailList)){
|
|
if (CollectionUtils.isEmpty(marketEmailList)){
|
|
|
- return;
|
|
|
|
|
|
|
+ continue;
|
|
|
}
|
|
}
|
|
|
log.info("queryWrapper: {}", queryWrapper);
|
|
log.info("queryWrapper: {}", queryWrapper);
|
|
|
log.info("marketEmailList: {}", marketEmailList);
|
|
log.info("marketEmailList: {}", marketEmailList);
|
|
@@ -1057,6 +1060,7 @@ public class MarketEmailsServiceImpl extends MyBaseServiceImpl<MarketEmailsMappe
|
|
|
MarketEmailsEntity newMarketEmail = new MarketEmailsEntity();
|
|
MarketEmailsEntity newMarketEmail = new MarketEmailsEntity();
|
|
|
BeanUtils.copyProperties(marketEmail, newMarketEmail);
|
|
BeanUtils.copyProperties(marketEmail, newMarketEmail);
|
|
|
newMarketEmail.setId(null);
|
|
newMarketEmail.setId(null);
|
|
|
|
|
+ newMarketEmail.setEmailId(null);
|
|
|
newMarketEmail.setStatus(-1);
|
|
newMarketEmail.setStatus(-1);
|
|
|
//取当前时间30分钟后
|
|
//取当前时间30分钟后
|
|
|
Date expectSendTime = DateUtils.addMinutes(new Date(), 30);
|
|
Date expectSendTime = DateUtils.addMinutes(new Date(), 30);
|