From e1054848e6ab5485f122f5d537bd665fdfea666d Mon Sep 17 00:00:00 2001
From: xuhy <3313886187@qq.com>
Date: 星期四, 27 二月 2025 11:49:38 +0800
Subject: [PATCH] Merge branch 'xizang-changyun' of https://gitee.com/xiaochen991015/xizang
---
ruoyi-common/src/main/java/com/ruoyi/common/utils/TencentMailUtil.java | 4 ++++
ruoyi-common/src/main/java/com/ruoyi/common/utils/SmsUtil.java | 5 +++++
ruoyi-system/src/main/java/com/ruoyi/system/service/impl/TBillServiceImpl.java | 8 ++++++--
ruoyi-common/src/main/java/com/ruoyi/common/config/MailProperties.java | 10 ++++++++++
4 files changed, 25 insertions(+), 2 deletions(-)
diff --git a/ruoyi-common/src/main/java/com/ruoyi/common/config/MailProperties.java b/ruoyi-common/src/main/java/com/ruoyi/common/config/MailProperties.java
index 2e525c6..2774be6 100644
--- a/ruoyi-common/src/main/java/com/ruoyi/common/config/MailProperties.java
+++ b/ruoyi-common/src/main/java/com/ruoyi/common/config/MailProperties.java
@@ -17,4 +17,14 @@
private String userName = "测试";
+ /**
+ * 账单提醒 ，同一个用户离上次发送短信的最小间隔
+ * 单位分钟
+ */
+ private Integer billSmsDelayPeriod = 60;
+ /**
+ * 账单提醒 ，同一个用户离上次发送邮件的最小间隔
+ * 单位分钟
+ */
+ private Integer billMailDelayPeriod = 60;
}
diff --git a/ruoyi-common/src/main/java/com/ruoyi/common/utils/SmsUtil.java b/ruoyi-common/src/main/java/com/ruoyi/common/utils/SmsUtil.java
index 34de308..2ca307f 100644
--- a/ruoyi-common/src/main/java/com/ruoyi/common/utils/SmsUtil.java
+++ b/ruoyi-common/src/main/java/com/ruoyi/common/utils/SmsUtil.java
@@ -25,6 +25,11 @@
SmsProperties smsProperties;
static SmsClient smsClient;
+
+ public SmsProperties getPro() {
+ return smsProperties;
+ }
+
public SmsClient createSmsClient(SmsProperties properties) {
// 实例化一个认证对象，入参需要传入腾讯云账户 SecretId，SecretKey。
// 为了保护密钥安全，建议将密钥设置在环境变量中或者配置文件中，请参考凭证管理 https://github.com/TencentCloud/tencentcloud-sdk-java?tab=readme-ov-file#%E5%87%AD%E8%AF%81%E7%AE%A1%E7%90%86。
diff --git a/ruoyi-common/src/main/java/com/ruoyi/common/utils/TencentMailUtil.java b/ruoyi-common/src/main/java/com/ruoyi/common/utils/TencentMailUtil.java
index 1c9c887..bd7321c 100644
--- a/ruoyi-common/src/main/java/com/ruoyi/common/utils/TencentMailUtil.java
+++ b/ruoyi-common/src/main/java/com/ruoyi/common/utils/TencentMailUtil.java
@@ -21,6 +21,10 @@
@Autowired
MailProperties properties;
+ public MailProperties getPro() {
+ return properties;
+ }
+
/**
*
* @param emailAddress 邮件接收者email地址
diff --git a/ruoyi-system/src/main/java/com/ruoyi/system/service/impl/TBillServiceImpl.java b/ruoyi-system/src/main/java/com/ruoyi/system/service/impl/TBillServiceImpl.java
index 0386353..d5ebbec 100644
--- a/ruoyi-system/src/main/java/com/ruoyi/system/service/impl/TBillServiceImpl.java
+++ b/ruoyi-system/src/main/java/com/ruoyi/system/service/impl/TBillServiceImpl.java
@@ -10,6 +10,7 @@
import com.ruoyi.common.utils.DateUtils;
import com.ruoyi.common.utils.SmsUtil;
import com.ruoyi.common.utils.StringUtils;
+import com.ruoyi.common.utils.TencentMailUtil;
import com.ruoyi.common.utils.uuid.UUID;
import com.ruoyi.system.dto.OfflinePayCheckDto;
import com.ruoyi.system.dto.SmsByBillDto;
@@ -81,8 +82,10 @@
@Resource
SmsUtil smsUtil;
+
@Resource
- SmsProperties smsProperties;
+ TencentMailUtil mailUtil;
+
public PageInfo<TBillDto> queryPage(TBillQuery query){
PageInfo<TBill> pageInfo = new PageInfo<>(query.getPageNum(), query.getPageSize());
PageInfo<TBillDto> info = tBillMapper.page(pageInfo, query);
@@ -394,6 +397,7 @@
TBillDto bill = getDetailByBillId(billId);
if (bill.getSmsLastTime()!=null
&& (System.currentTimeMillis()-bill.getSmsLastTime().getTime()<smsProperties.getBillMailDelayPeriod()*60*1000L)){
+ && (System.currentTimeMillis()-bill.getSmsLastTime().getTime()<mailUtil.getPro().getBillMailDelayPeriod()*60*1000L)){
throw new ServiceException("有账单最近一次发送的时间是:"+DateUtils.parseDateToStr(DateUtils.YYYY_MM_DD_HH_MM_SS,bill.getSmsLastTime()));
}
if (StringUtils.isEmpty(bill.getEmail())){
@@ -403,7 +407,7 @@
TBill save = new TBill();
save.setId(bill.getId());
try {
- //todo 发送邮件
+ mailUtil.send(bill.getEmail(),bill.getHouseName());
save.setMailStatus(1);
}catch (ServiceException e){
failNum++;
--
Gitblit v1.7.1