From a0f65b9cc2efbbbcfb1b2a7974a44b54ba937d04 Mon Sep 17 00:00:00 2001
From: MrShi <1878285526@qq.com>
Date: 星期六, 08 二月 2025 17:18:54 +0800
Subject: [PATCH] Merge branch '2.0.1' of http://139.186.142.91:10010/r/productDev/funingyunwei into 2.0.1
---
server/visits/dmvisit_service/src/main/java/com/doumee/service/business/impl/SmsEmailServiceImpl.java | 4 +++-
1 files changed, 3 insertions(+), 1 deletions(-)
diff --git a/server/visits/dmvisit_service/src/main/java/com/doumee/service/business/impl/SmsEmailServiceImpl.java b/server/visits/dmvisit_service/src/main/java/com/doumee/service/business/impl/SmsEmailServiceImpl.java
index 4d4beaf..b760dd1 100644
--- a/server/visits/dmvisit_service/src/main/java/com/doumee/service/business/impl/SmsEmailServiceImpl.java
+++ b/server/visits/dmvisit_service/src/main/java/com/doumee/service/business/impl/SmsEmailServiceImpl.java
@@ -106,10 +106,11 @@
String code = Constants.getRandom6Num();
SmsConfig smsConfig = smsConfigMapper.selectOne(new QueryWrapper<SmsConfig>().lambda().eq(SmsConfig::getObjType,
SmsConstants.inventCode).last(" limit 1 "));
+ String comName = systemDictDataBiz.queryByCode(Constants.SMS,Constants.SMS_COMNAME).getCode();
//寮�鍚煭淇￠�氱煡
if(Objects.nonNull(smsConfig) || Constants.equalsInteger(smsConfig.getStatus(),Constants.ZERO)){
if(StringUtils.isNotBlank(smsConfig.getContent())){
- String content = smsConfig.getContent().replace("{楠岃瘉鐮亇",code);
+ String content = comName + smsConfig.getContent().replace("{楠岃瘉鐮亇",code);
emayService.sendSingleSms(smsEmail.getPhone(),content);
smsEmail.setRemark(code);
smsEmail.setIsdeleted(Constants.ZERO);
@@ -617,6 +618,7 @@
if(result){
result= emailService.sendEmail(email,"璐﹀崟鍌垂",content,null);
}
+ content = systemDictDataBiz.queryByCode(Constants.SMS,Constants.SMS_COMNAME).getCode() + content;
SmsEmail smsEmail = new SmsEmail();
smsEmail.setRemark(result?"閭欢鍙戦�佹垚鍔�":"閭欢鍙戦�佸け璐�");
smsEmail.setIsdeleted(Constants.ZERO);
--
Gitblit v1.9.3