Merge remote-tracking branch 'origin/hxsj' into hxsj

gongchunyi

2 天以前 75ab3e422024b04730c2ce3b5014890d3e731fa8

 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);
            }