From 7de835dea145fe8229f5f0100e2a90094e6d5b22 Mon Sep 17 00:00:00 2001
From: MrShi <1878285526@qq.com>
Date: 星期五, 07 二月 2025 18:49:38 +0800
Subject: [PATCH] 改bug
---
server/visits/dmvisit_service/src/main/java/com/doumee/service/business/impl/SmsEmailServiceImpl.java | 54 +++++++++++++++++++++++++++++++++++++++++++++++++++++-
1 files changed, 53 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 2edabc8..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
@@ -18,6 +18,7 @@
import com.doumee.dao.system.SystemUserMapper;
import com.doumee.dao.system.model.SystemUser;
import com.doumee.service.business.SmsEmailService;
+import com.doumee.service.business.third.EmailService;
import com.doumee.service.business.third.EmayService;
import org.apache.commons.lang3.StringUtils;
import org.springframework.beans.factory.annotation.Autowired;
@@ -105,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);
@@ -579,4 +581,54 @@
}
}
+
+
+ @Override
+ public Integer sendBillSms(String content,String mobile,Integer billId) {
+ boolean result = true;
+ if(StringUtils.isBlank(mobile)){
+ result = false;
+ }
+ if(result){
+ result = emayService.sendSingleSms(mobile,content);
+ }
+ SmsEmail smsEmail = new SmsEmail();
+ smsEmail.setIsdeleted(Constants.ZERO);
+ smsEmail.setCreateDate(new Date());
+ smsEmail.setStatus(result?Constants.ZERO:Constants.ONE);
+ smsEmail.setType(Constants.ZERO);
+ smsEmail.setRemark(result?"鐭俊鍙戦�佹垚鍔�":"鐭俊鍙戦�佸け璐�");
+ smsEmail.setTitle("璐﹀崟鍌垂");
+ smsEmail.setObjId(billId);
+ smsEmail.setObjType(Constants.ONE+"");
+ smsEmail.setContent(content);
+ smsEmailMapper.insert(smsEmail);
+ return smsEmail.getId();
+ }
+
+ @Autowired
+ private EmailService emailService;
+
+ @Override
+ public Integer sendEmail(String email,String content,Integer billId) {
+ boolean result = true;
+ if(StringUtils.isBlank(email)){
+ result = false;
+ }
+ 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);
+ smsEmail.setCreateDate(new Date());
+ smsEmail.setStatus(result?Constants.ZERO:Constants.ONE);
+ smsEmail.setType(Constants.TWO);
+ smsEmail.setObjId(billId);
+ smsEmail.setObjType(Constants.TWO+"");
+ smsEmail.setContent(content);
+ smsEmailMapper.insert(smsEmail);
+ return smsEmail.getId();
+ }
}
--
Gitblit v1.9.3