|
|
@@ -817,7 +817,7 @@ public class MarketEmailsServiceImpl extends MyBaseServiceImpl<MarketEmailsMappe
|
|
|
|
|
|
Map sendMap = new HashMap();
|
|
|
sendMap.put("country", country);
|
|
|
- sendMap.put("beginDate", marketingCampaignEntity.getBeginData());
|
|
|
+ sendMap.put("beginDate", marketingCampaignEntity.getBeginData().toString());
|
|
|
sendMap.put("steps", sopDetailEntityString);
|
|
|
|
|
|
ChatDTO chatDTO = new ChatDTO();
|
|
|
@@ -871,8 +871,11 @@ public class MarketEmailsServiceImpl extends MyBaseServiceImpl<MarketEmailsMappe
|
|
|
queryWrapper.eq(MarketEmailsEntity::getMarketingCampaignId, marketingCampaignEntity.getId());
|
|
|
queryWrapper.eq(MarketEmailsEntity::getIsDelete, CommonConstant.DEL_FLAG_0);
|
|
|
List<MarketEmailsEntity> marketEmailsOldList = this.list(queryWrapper);
|
|
|
- marketEmailsOldList.forEach(marketEmail -> marketEmail.setIsDelete(CommonConstant.DEL_FLAG_1));
|
|
|
- this.updateBatchById(marketEmailsOldList);
|
|
|
+ if (!CollectionUtils.isEmpty(marketEmailsOldList)) {
|
|
|
+ marketEmailsOldList.forEach(marketEmail -> marketEmail.setIsDelete(CommonConstant.DEL_FLAG_1));
|
|
|
+ this.updateBatchById(marketEmailsOldList);
|
|
|
+ }
|
|
|
+
|
|
|
//删除原有关联邮件记录
|
|
|
// List<Long> emailIdList = marketEmailsOldList.stream().map(MarketEmailsEntity::getEmailId).collect(Collectors.toList());
|
|
|
// LambdaUpdateWrapper<MktMailStatusEntity> updateWrapper = new LambdaUpdateWrapper<>();
|