Commit 194437da authored by Smile's avatar Smile

Merge remote-tracking branch 'origin/jd_dev' into jd_dev

parents ddf90261 dec8609d
...@@ -392,8 +392,13 @@ public class SmsSendServiceImpl implements SmsSendService { ...@@ -392,8 +392,13 @@ public class SmsSendServiceImpl implements SmsSendService {
.setMobile(mobile) .setMobile(mobile)
.setSmsTemplateDTO(SmsTemplateConvert.INSTANCE.toDto(smsTemplate)) .setSmsTemplateDTO(SmsTemplateConvert.INSTANCE.toDto(smsTemplate))
.setTemplateParams(newTemplateParams); .setTemplateParams(newTemplateParams);
// 判断渠道
SmsChannelDO smsChannel = smsChannelService.getSmsChannel(smsTemplate.getChannelId());
if (smsChannel == null) {
throw exception(SMS_CHANNEL_NOT_EXISTS);
}
//根据debug配置决定是否发送短信 //根据debug配置决定是否发送短信
if (Objects.isNull(businessProperties) || !businessProperties.isDebug()) { if ((Objects.isNull(businessProperties) || !businessProperties.isDebug()) && smsChannel.getStatus() == 0) {
smsProducer.sendSmsSendMessageV2(smsSendMessage); smsProducer.sendSmsSendMessageV2(smsSendMessage);
} }
return sendLogId; return sendLogId;
......
Markdown is supported
0% or
You are about to add 0 people to the discussion. Proceed with caution.
Finish editing this message first!
Please register or to comment