From 823b3791ea60888168b277110cfce607e5eed3e4 Mon Sep 17 00:00:00 2001
From: xuhy <3313886187@qq.com>
Date: 星期三, 26 二月 2025 17:50:41 +0800
Subject: [PATCH] Merge branch 'xizang-changyun' of https://gitee.com/xiaochen991015/xizang
---
ruoyi-system/src/main/java/com/ruoyi/system/service/impl/TBillServiceImpl.java | 9 +++++----
1 files changed, 5 insertions(+), 4 deletions(-)
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 88b06ed..a694c73 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
@@ -30,6 +30,7 @@
import org.springframework.transaction.annotation.Transactional;
import javax.annotation.Resource;
+import javax.validation.constraints.NotEmpty;
import java.util.*;
import java.util.stream.Collectors;
import java.math.BigDecimal;
@@ -359,7 +360,7 @@
public Integer sendSmsByBillIds(SmsByBillDto dto) {
int failNum = 0;
for (String billId : dto.getBillIds()) {
- TBillDto bill = getTenentByBillId(billId);
+ TBillDto bill = getDetailByBillId(billId);
if (bill.getSmsLastTime()!=null
&& (System.currentTimeMillis()-bill.getSmsLastTime().getTime()<smsUtil.getPro().getBillSmsDelayPeriod()*60*1000L)){
throw new ServiceException("有账单最近一次发送的时间是:"+DateUtils.parseDateToStr(DateUtils.YYYY_MM_DD_HH_MM_SS,bill.getSmsLastTime()));
@@ -388,7 +389,7 @@
public Integer sendMailBatchByBillIds(SmsByBillDto dto) {
int failNum = 0;
for (String billId : dto.getBillIds()) {
- TBillDto bill = getTenentByBillId(billId);
+ TBillDto bill = getDetailByBillId(billId);
if (bill.getSmsLastTime()!=null
&& (System.currentTimeMillis()-bill.getSmsLastTime().getTime()<smsUtil.getPro().getBillMailDelayPeriod()*60*1000L)){
throw new ServiceException("有账单最近一次发送的时间是:"+DateUtils.parseDateToStr(DateUtils.YYYY_MM_DD_HH_MM_SS,bill.getSmsLastTime()));
@@ -413,8 +414,8 @@
return failNum;
}
- private TBillDto getTenentByBillId(String billId) {
- return getBaseMapper().selectTenentByBillId(billId);
+ public TBillDto getDetailByBillId(@NotEmpty String billId) {
+ return getBaseMapper().selectDetailByBillId(billId);
}
--
Gitblit v1.7.1