From 0ab9dfd8f122195e4e9f09bd50c59e0a47450bec Mon Sep 17 00:00:00 2001
From: mitao <2763622819@qq.com>
Date: 星期三, 19 三月 2025 15:50:03 +0800
Subject: [PATCH] fix: resolve merge conflicts in .gitignore
---
ruoyi-system/src/main/java/com/ruoyi/system/service/TBillService.java | 19 +++++++++++++++----
1 files changed, 15 insertions(+), 4 deletions(-)
diff --git a/ruoyi-system/src/main/java/com/ruoyi/system/service/TBillService.java b/ruoyi-system/src/main/java/com/ruoyi/system/service/TBillService.java
index 7721283..0015ee5 100644
--- a/ruoyi-system/src/main/java/com/ruoyi/system/service/TBillService.java
+++ b/ruoyi-system/src/main/java/com/ruoyi/system/service/TBillService.java
@@ -2,13 +2,12 @@
import com.baomidou.mybatisplus.extension.service.IService;
import com.ruoyi.common.basic.PageInfo;
-import com.ruoyi.system.dto.OfflinePayCheckDto;
-import com.ruoyi.system.dto.TBillDto;
-import com.ruoyi.system.dto.TbillSaveDto;
+import com.ruoyi.system.dto.*;
import com.ruoyi.system.model.TBill;
import com.ruoyi.system.query.TBillQuery;
import com.taxi591.bankapi.dto.ChargeBillRequest;
+import javax.validation.constraints.NotEmpty;
import java.math.BigDecimal;
import java.util.List;
import java.util.function.Consumer;
@@ -75,5 +74,17 @@
* @param invoiceId
* @return
*/
- PageInfo<TBill> getBillByInvoiceId(String invoiceId);
+ PageInfo<TBillDto> getBillByInvoiceId(String invoiceId);
+
+ Integer sendSmsByBillIds(SmsByBillDto dto);
+
+ Integer sendMailBatchByBillIds(SmsByBillDto dto);
+
+ TBillDto getDetailByBillId(@NotEmpty String id);
+
+ Boolean cashPay(CachPayDto offlinePayDto);
+
+ BillStatisticsDto statistics();
+
+ Integer batchBillCount(String userId, List<String> billIds);
}
--
Gitblit v1.7.1