From 086adfdf1d5340a3503da5b5ebcae9073775450e Mon Sep 17 00:00:00 2001
From: 陶杰 <1378534974@qq.com>
Date: 星期一, 30 十二月 2024 13:59:40 +0800
Subject: [PATCH] Merge remote-tracking branch 'origin/master-v4' into master-v4
---
src/main/java/com/mzl/flower/service/impl/sms/SmsTaskServiceImpl.java | 7 +++++--
1 files changed, 5 insertions(+), 2 deletions(-)
diff --git a/src/main/java/com/mzl/flower/service/impl/sms/SmsTaskServiceImpl.java b/src/main/java/com/mzl/flower/service/impl/sms/SmsTaskServiceImpl.java
index f3af2d8..1c05dcd 100644
--- a/src/main/java/com/mzl/flower/service/impl/sms/SmsTaskServiceImpl.java
+++ b/src/main/java/com/mzl/flower/service/impl/sms/SmsTaskServiceImpl.java
@@ -374,7 +374,7 @@
// 异步保存任务明细信息并发送短信
CompletableFuture.runAsync(() -> {
smsTaskDetailService.saveBatch(smsTaskDetailDOList);
- sendSmsToAll(smsTaskDetailDOList, smsTaskDO.getSmsTemplateId());
+ sendSmsToAll(smsTaskDetailDOList, smsTaskDO.getSmsTemplateId(),smsTaskDTO.getId());
});
}
@@ -416,7 +416,7 @@
}).collect(Collectors.toList());
}
- private void sendSmsToAll(List<SmsTaskDetailDO> smsTaskDetailDOList, Long smsTemplateId) {
+ private void sendSmsToAll(List<SmsTaskDetailDO> smsTaskDetailDOList, Long smsTemplateId,Long id) {
SmsTemplateDO smsTemplateDO = smsTemplateMapper.selectById(smsTemplateId);
String templateCode = smsTemplateDO.getCode();
for (SmsTaskDetailDO detail : smsTaskDetailDOList) {
@@ -435,6 +435,9 @@
} finally {
//无论如何都更新结果
smsTaskDetailMapper.updateById(detail);
+ SmsTaskDO smsTaskDO = smsTaskMapper.selectById(id);
+ smsTaskDO.setStatus(Constants.SMS_TASK_STATUS.complete.name());
+ smsTaskMapper.updateById(smsTaskDO);
}
}
}
--
Gitblit v1.9.3