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 | 62 ++++++++++++++++++++++++++++++
1 files changed, 61 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 8f126e6..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
@@ -15,7 +15,10 @@
import com.doumee.dao.business.dao.SmsConfigMapper;
import com.doumee.dao.business.dao.SmsEmailMapper;
import com.doumee.dao.business.model.*;
+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;
@@ -44,6 +47,8 @@
private EmayService emayService;
@Autowired
private SmsConfigMapper smsConfigMapper;
+ @Autowired
+ private SystemUserMapper systemUserMapper;
@Value("${debug_model}")
private boolean debugModel;
@@ -86,6 +91,10 @@
if(StringUtils.isBlank(smsEmail.getPhone())){
throw new BusinessException(ResponseStatus.BAD_REQUEST);
}
+ //鏍规嵁鎵嬫満鍙锋煡璇㈢敤鎴�
+ if(systemUserMapper.selectCount(new QueryWrapper<SystemUser>().lambda().eq(SystemUser::getMobile,smsEmail.getPhone()))==Constants.ZERO){
+ throw new BusinessException(ResponseStatus.SERVER_ERROR.getCode(),"瀵逛笉璧凤紝鎵嬫満鍙锋棤鏁堣妫�鏌ュ悗閲嶈瘯!");
+ };
String nowDate = DateUtil.getFomartDate(new Date(),"yyyy-MM-dd HH:mm:ss");
if(smsEmailMapper.selectCount(new QueryWrapper<SmsEmail>().lambda()
.eq(SmsEmail::getPhone,smsEmail.getPhone())
@@ -97,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);
@@ -571,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