From 75ab3e422024b04730c2ce3b5014890d3e731fa8 Mon Sep 17 00:00:00 2001
From: gongchunyi <deslre0381@gmail.com>
Date: 星期五, 03 四月 2026 18:39:57 +0800
Subject: [PATCH] Merge remote-tracking branch 'origin/hxsj' into hxsj
---
src/main/java/com/ruoyi/purchase/service/impl/PaymentRegistrationServiceImpl.java | 11 ++++++++---
1 files changed, 8 insertions(+), 3 deletions(-)
diff --git a/src/main/java/com/ruoyi/purchase/service/impl/PaymentRegistrationServiceImpl.java b/src/main/java/com/ruoyi/purchase/service/impl/PaymentRegistrationServiceImpl.java
index 30e838f..9af16c6 100644
--- a/src/main/java/com/ruoyi/purchase/service/impl/PaymentRegistrationServiceImpl.java
+++ b/src/main/java/com/ruoyi/purchase/service/impl/PaymentRegistrationServiceImpl.java
@@ -402,7 +402,7 @@
paymentHistoryRecordVo.setCurrentPaymentAmount(currentPaymentAmount);
paymentHistoryRecordVo.setInvoiceAmount(invoiceAmount);
amountTotal = paymentHistoryRecordVo.getInvoiceAmount().subtract(paymentHistoryRecordVo.getCurrentPaymentAmount());
- paymentHistoryRecordVo.setPayableAmount(amountTotal);
+ paymentHistoryRecordVo.setPayableAmount(amountTotal.abs());
result.add(paymentHistoryRecordVo);
}
@@ -410,11 +410,16 @@
for (int i = 0; i < result.size(); i++) {
PaymentHistoryRecordVo paymentHistoryRecordVo = result.get(i);
if (i == 0) {
- paymentHistoryRecordVo.setPayableAmount(paymentHistoryRecordVo.getInvoiceAmount().subtract(paymentHistoryRecordVo.getCurrentPaymentAmount()));
+ paymentHistoryRecordVo.setPayableAmount(paymentHistoryRecordVo
+ .getInvoiceAmount()
+ .subtract(paymentHistoryRecordVo.getCurrentPaymentAmount())
+ .abs());
}else {
PaymentHistoryRecordVo paymentHistoryRecordVo1 = result.get(i-1);
paymentHistoryRecordVo.setPayableAmount(paymentHistoryRecordVo1.getPayableAmount()
- .add(paymentHistoryRecordVo.getInvoiceAmount()).subtract(paymentHistoryRecordVo.getCurrentPaymentAmount()));
+ .add(paymentHistoryRecordVo.getInvoiceAmount())
+ .subtract(paymentHistoryRecordVo.getCurrentPaymentAmount())
+ .abs());
}
newResult.add(paymentHistoryRecordVo);
}
--
Gitblit v1.9.3