From d2885d323c9a75e62e49b7cb5ba48165e0e489bf Mon Sep 17 00:00:00 2001
From: liyong <18434998025@163.com>
Date: 星期四, 19 六月 2025 16:51:44 +0800
Subject: [PATCH] 2025-06-19 参数修改
---
src/main/java/com/ruoyi/sales/service/impl/ReceiptPaymentServiceImpl.java | 8 ++++++--
1 files changed, 6 insertions(+), 2 deletions(-)
diff --git a/src/main/java/com/ruoyi/sales/service/impl/ReceiptPaymentServiceImpl.java b/src/main/java/com/ruoyi/sales/service/impl/ReceiptPaymentServiceImpl.java
index c2b0619..f65d7ce 100644
--- a/src/main/java/com/ruoyi/sales/service/impl/ReceiptPaymentServiceImpl.java
+++ b/src/main/java/com/ruoyi/sales/service/impl/ReceiptPaymentServiceImpl.java
@@ -134,7 +134,11 @@
*/
@Override
public IPage<ReceiptPaymentDto> bindInvoiceNoRegPage(Page page, ReceiptPaymentDto receiptPaymentDto) {
- return receiptPaymentMapper.bindInvoiceNoRegPage(page, receiptPaymentDto);
+ IPage<ReceiptPaymentDto> receiptPaymentDtoIPage = receiptPaymentMapper.bindInvoiceNoRegPage(page, receiptPaymentDto);
+ if (receiptPaymentDto.getStatus()) {
+ receiptPaymentDtoIPage.getRecords().removeIf(receiptPaymentDto1 -> new BigDecimal("0.00").equals(receiptPaymentDto1.getNoReceiptAmount()));
+ }
+ return receiptPaymentDtoIPage;
}
/**
@@ -235,7 +239,7 @@
customerInteractionDto.setHappenTime(localDate);
customerInteractionDto.setInvoiceAmount(invoiceAmount);
customerInteractionDto.setReceiptAmount(currentReceiptAmount);
- amountTotal = amountTotal.add(currentDateTotal);
+ amountTotal = customerInteractionDto.getInvoiceAmount().subtract(customerInteractionDto.getReceiptAmount());
customerInteractionDto.setUnReceiptAmount(amountTotal);
result.add(customerInteractionDto);
}
--
Gitblit v1.9.3