From 3be6fa0c0e6eca79a08ee3b4f30bc882388b9cc1 Mon Sep 17 00:00:00 2001
From: yupeng <roc__yu@163.com>
Date: 星期三, 26 三月 2025 17:29:47 +0800
Subject: [PATCH] Merge remote-tracking branch 'origin/master' into xizang-changyun
---
ruoyi-system/src/main/java/com/ruoyi/system/service/TBillService.java | 23 ++++++++++++++++++-----
1 files changed, 18 insertions(+), 5 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 f25fc38..abf30a2 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,18 +2,21 @@
import com.baomidou.mybatisplus.extension.service.IService;
import com.ruoyi.common.basic.PageInfo;
-import com.ruoyi.system.dto.*;
+import com.ruoyi.system.dto.BillStatisticsDto;
+import com.ruoyi.system.dto.CachPayDto;
+import com.ruoyi.system.dto.OfflinePayCheckDto;
+import com.ruoyi.system.dto.SmsByBillDto;
+import com.ruoyi.system.dto.TBillDto;
+import com.ruoyi.system.dto.TbillSaveDto;
import com.ruoyi.system.model.TBill;
import com.ruoyi.system.query.TBillQuery;
+import com.ruoyi.system.vo.ScreenRentRankVO;
import com.taxi591.bankapi.dto.ChargeBillRequest;
import javax.validation.constraints.NotEmpty;
import java.math.BigDecimal;
import java.util.List;
import java.util.function.Consumer;
-import java.util.function.Function;
-
-import java.util.List;
/**
* <p>
@@ -74,7 +77,7 @@
* @param invoiceId
* @return
*/
- PageInfo<TBill> getBillByInvoiceId(String invoiceId);
+ PageInfo<TBillDto> getBillByInvoiceId(String invoiceId);
Integer sendSmsByBillIds(SmsByBillDto dto);
@@ -83,4 +86,14 @@
TBillDto getDetailByBillId(@NotEmpty String id);
Boolean cashPay(CachPayDto offlinePayDto);
+
+ BillStatisticsDto statistics();
+
+ Integer batchBillCount(String userId, List<String> billIds);
+
+ /**
+ * 查询街道租金排行
+ * @return
+ */
+ List<ScreenRentRankVO> getStreetRentRank();
}
--
Gitblit v1.7.1