From 09f98d8509fb22db2edcc18bdafc0c7ab7c3baa1 Mon Sep 17 00:00:00 2001 From: xuhy <3313886187@qq.com> Date: 星期一, 07 四月 2025 09:12:05 +0800 Subject: [PATCH] Merge branch 'dev' of http://120.76.84.145:10101/gitblit/r/java/xizang into dev --- ruoyi-system/src/main/java/com/ruoyi/system/service/TBillService.java | 35 ++++++++++++++++++++++++++++++++--- 1 files changed, 32 insertions(+), 3 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 1fd2b07..cc4ff80 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,21 +2,22 @@ import com.baomidou.mybatisplus.extension.service.IService; import com.ruoyi.common.basic.PageInfo; +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.Date; import java.util.List; import java.util.function.Consumer; -import java.util.function.Function; - -import java.util.List; /** * <p> @@ -84,4 +85,32 @@ Integer sendMailBatchByBillIds(SmsByBillDto dto); TBillDto getDetailByBillId(@NotEmpty String id); + + Boolean cashPay(CachPayDto offlinePayDto); + + BillStatisticsDto statistics(String busdeptId); + + Integer batchBillCount(String userId, List<String> billIds); + + /** + * 查询街道租金排行 + * @return + */ + List<ScreenRentRankVO> getStreetRentRank(String businessDeptId); + + /** + * 查询季付账单 + * @param businessDeptId + * @return + */ + List<TBill> getJiFuBillList(String businessDeptId); + + /** + * 查询当前季度的季付账单 + * @param businessDeptId + * @param first + * @param last + * @return + */ + List<TBill> getJiFuBillListByTime(String businessDeptId, Date first, Date last); } -- Gitblit v1.7.1