From af107f8697ed128acfe7fca372ca365ac597d6cf Mon Sep 17 00:00:00 2001
From: liyong <18434998025@163.com>
Date: 星期一, 23 六月 2025 09:24:20 +0800
Subject: [PATCH] 2025-06-23 设备台账，设备报修接口开发
---
src/main/java/com/ruoyi/sales/service/impl/ReceiptPaymentServiceImpl.java | 17 ++++++++++++++---
1 files changed, 14 insertions(+), 3 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 3e4de3d..f65d7ce 100644
--- a/src/main/java/com/ruoyi/sales/service/impl/ReceiptPaymentServiceImpl.java
+++ b/src/main/java/com/ruoyi/sales/service/impl/ReceiptPaymentServiceImpl.java
@@ -4,7 +4,6 @@
import com.baomidou.mybatisplus.core.metadata.IPage;
import com.baomidou.mybatisplus.extension.plugins.pagination.Page;
import com.baomidou.mybatisplus.extension.service.impl.ServiceImpl;
-import com.ruoyi.purchase.dto.PaymentHistoryRecordVo;
import com.ruoyi.sales.dto.CustomerInteractionDto;
import com.ruoyi.sales.dto.InvoiceLedgerDto;
import com.ruoyi.sales.dto.ReceiptPaymentDto;
@@ -135,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;
}
/**
@@ -236,10 +239,18 @@
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);
}
return result;
}
+
+ /**
+ * 鏌ヨ鍥炴璁板綍鍒嗛〉
+ */
+ @Override
+ public List<ReceiptPaymentDto> receiptPaymentHistoryListNoPage(ReceiptPaymentDto receiptPaymentDto) {
+ return receiptPaymentMapper.receiptPaymentHistoryListNoPage( receiptPaymentDto);
+ }
}
--
Gitblit v1.9.3