yys 取绝对值

云

2 天以前 263184b07832118da6283391683bdcebf15d2eec

yys 取绝对值

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

 src/main/java/com/ruoyi/sales/service/impl/ReceiptPaymentServiceImpl.java

@@ -275,18 +275,21 @@
            customerInteractionDto.setInvoiceAmount(invoiceAmount);
            customerInteractionDto.setReceiptAmount(currentReceiptAmount);
            amountTotal = customerInteractionDto.getInvoiceAmount().subtract(customerInteractionDto.getReceiptAmount());
            customerInteractionDto.setUnReceiptAmount(amountTotal);
            customerInteractionDto.setUnReceiptAmount(amountTotal.abs());
            result.add(customerInteractionDto);
        }
        ArrayList<CustomerInteractionDto> newResult = new ArrayList<>();
        for (int i = 0; i < result.size(); i++) {
            CustomerInteractionDto customerInteractionDto = result.get(i);
            if (i == 0) {
                customerInteractionDto.setUnReceiptAmount(customerInteractionDto.getInvoiceAmount().subtract(customerInteractionDto.getReceiptAmount()));
                customerInteractionDto.setUnReceiptAmount(customerInteractionDto
                        .getInvoiceAmount()
                        .subtract(customerInteractionDto.getReceiptAmount())
                        .abs());
            }else {
                CustomerInteractionDto customerInteractionDto1 = result.get(i-1);
                customerInteractionDto.setUnReceiptAmount(customerInteractionDto1.getUnReceiptAmount()
                        .add(customerInteractionDto.getInvoiceAmount()).subtract(customerInteractionDto.getReceiptAmount()));
                        .add(customerInteractionDto.getInvoiceAmount()).subtract(customerInteractionDto.getReceiptAmount()).abs());
            }
            newResult.add(customerInteractionDto);
        }