From 4d099c31e09855ec4d54ab72e40062042feddad8 Mon Sep 17 00:00:00 2001
From: xuhy <3313886187@qq.com>
Date: 星期三, 23 四月 2025 10:55:40 +0800
Subject: [PATCH] Merge branch 'xizang-changyun' of https://gitee.com/xiaochen991015/xizang into dev
---
ruoyi-system/src/main/java/com/ruoyi/system/service/impl/TBillServiceImpl.java | 10 ++++------
1 files changed, 4 insertions(+), 6 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 01439f8..23c3862 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
@@ -154,7 +154,7 @@
if (presist.getPayFeesStatus().equals("3")){
throw new ServiceException("该账单已缴费完成");
}
- save.setBusinessDeptId(presist.getBusinessDeptId());
+
switch (type){
// 仅更新除金额字段外的属性
case 1:
@@ -201,7 +201,7 @@
.subtract(save.getPayFeesMoney());
save.setOutstandingMoney(outstand);
//抵扣金额就是缴费金额
- save.setDeductionMoney(tBill.getPayableFeesMoney());
+ save.setDeductionMoney(tBill.getPayFeesMoney());
save.setPreOutstand(presist.getOutstandingMoney());
if (outstand.compareTo(BigDecimal.ZERO)<=0){
save.setPayFeesStatus("3");
@@ -211,6 +211,7 @@
break;
}
+ save.setBusinessDeptId(presist.getBusinessDeptId());
updateById(save);
return save;
}finally {
@@ -418,6 +419,7 @@
}
}
+
/**
* 根据发票编号查询账单列表
@@ -668,8 +670,4 @@
}
- @Override
- public List<ScreenRentRankVO> getStreetRentRank() {
- return null;
- }
}
--
Gitblit v1.7.1