From 8cd5154f68bc0302ea25aa6b84a3b3786d855504 Mon Sep 17 00:00:00 2001
From: xuhy <3313886187@qq.com>
Date: 星期三, 02 四月 2025 20:04:47 +0800
Subject: [PATCH] Merge branch 'master' of https://gitee.com/xiaochen991015/xizang
---
ruoyi-system/src/main/java/com/ruoyi/system/service/impl/TBillServiceImpl.java | 13 ++++++++-----
1 files changed, 8 insertions(+), 5 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 57597b2..b8e6ddc 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
@@ -301,6 +301,7 @@
TFlowManagement save = new TFlowManagement();
save.setPayType(3);
save.setPayer(dto.getPayer());
+ save.setBusinessDeptId(bill.getBusinessDeptId());
save.setPayTime(bankflow.getPayTime());
save.setSysSerialNumber(OrderNos.getDid(30));
save.setBankSerialNumber(bankflow.getBankSerialNumber());
@@ -382,6 +383,7 @@
TFlowManagement saveFlow = new TFlowManagement();
saveFlow.setPayType(1);
saveFlow.setPayer(order.getUserId());
+ saveFlow.setBusinessDeptId(bill.getBusinessDeptId());
saveFlow.setPayTime(DateUtils.dateToLocalDateTime(save.getPayTime()));
saveFlow.setSysSerialNumber(OrderNos.getDid(30));
saveFlow.setBankSerialNumber(save.getPayNo());
@@ -549,6 +551,7 @@
TFlowManagement save = new TFlowManagement();
save.setPayType(3);
save.setPayer(dto.getPayer());
+ save.setBusinessDeptId(bill.getBusinessDeptId());
save.setPayTime(bankflow!=null?bankflow.getPayTime():DateUtils.dateToLocalDateTime(new Date()));
save.setSysSerialNumber(OrderNos.getDid());
save.setBankSerialNumber(bankflow!=null?bankflow.getBankSerialNumber():null);
@@ -563,12 +566,12 @@
}
@Override
- public BillStatisticsDto statistics() {
+ public BillStatisticsDto statistics(String busDeptId) {
BillStatisticsDto dto = new BillStatisticsDto();
- dto.setRent(getBaseMapper().statisticsAllRent());
- dto.setNopay(getBaseMapper().statisticsNoPay());
- dto.setPayed(getBaseMapper().statisticsPayed());
- dto.setOverdue(getBaseMapper().statisticsOverdue());
+ dto.setRent(getBaseMapper().statisticsAllRent(busDeptId));
+ dto.setNopay(getBaseMapper().statisticsNoPay(busDeptId));
+ dto.setPayed(getBaseMapper().statisticsPayed(busDeptId));
+ dto.setOverdue(getBaseMapper().statisticsOverdue(busDeptId));
return dto;
}
--
Gitblit v1.7.1