From e8304b5b39787b25eb024fafd00d7db512ee6438 Mon Sep 17 00:00:00 2001
From: liding <756868258@qq.com>
Date: 星期一, 19 五月 2025 09:02:44 +0800
Subject: [PATCH] Merge remote-tracking branch 'origin/master'
---
src/main/java/com/ruoyi/sales/service/impl/InvoiceLedgerServiceImpl.java | 32 ++++++++++++++++++++++++++++++++
1 files changed, 32 insertions(+), 0 deletions(-)
diff --git a/src/main/java/com/ruoyi/sales/service/impl/InvoiceLedgerServiceImpl.java b/src/main/java/com/ruoyi/sales/service/impl/InvoiceLedgerServiceImpl.java
index 298f44a..89520b4 100644
--- a/src/main/java/com/ruoyi/sales/service/impl/InvoiceLedgerServiceImpl.java
+++ b/src/main/java/com/ruoyi/sales/service/impl/InvoiceLedgerServiceImpl.java
@@ -12,8 +12,10 @@
import com.ruoyi.sales.excel.InvoiceLedgerExcelDto;
import com.ruoyi.sales.mapper.InvoiceLedgerFileMapper;
import com.ruoyi.sales.mapper.InvoiceLedgerMapper;
+import com.ruoyi.sales.mapper.ReceiptPaymentMapper;
import com.ruoyi.sales.pojo.InvoiceLedger;
import com.ruoyi.sales.pojo.InvoiceLedgerFile;
+import com.ruoyi.sales.pojo.ReceiptPayment;
import com.ruoyi.sales.service.InvoiceLedgerService;
import org.apache.commons.collections4.CollectionUtils;
import org.springframework.beans.BeanUtils;
@@ -26,6 +28,7 @@
import javax.servlet.http.HttpServletResponse;
import java.io.File;
+import java.math.BigDecimal;
import java.util.Collections;
import java.util.List;
import java.util.UUID;
@@ -42,6 +45,9 @@
@Autowired
private InvoiceLedgerFileMapper invoiceLedgerFileMapper;
+
+ @Autowired
+ private ReceiptPaymentMapper receiptPaymentMapper;
/**
* 寮�绁ㄥ彴璐︽柊澧�
@@ -210,4 +216,30 @@
return invoiceLedgerMapper.invoiceLedgerList(invoiceLedgerDto);
}
+ /**
+ * 瀹㈡埛閿�鍞褰�
+ * @param page
+ * @param invoiceLedgerDto
+ * @return
+ */
+ @Override
+ public IPage<InvoiceLedgerDto> invoiceLedgerSalesAccount(Page page, InvoiceLedgerDto invoiceLedgerDto) {
+ IPage<InvoiceLedgerDto> invoiceLedgerDtoIPage = invoiceLedgerMapper.invoiceLedgerSalesAccount(page, invoiceLedgerDto);
+ for (InvoiceLedgerDto record : invoiceLedgerDtoIPage.getRecords()) {
+ QueryWrapper<ReceiptPayment> queryWrapper = new QueryWrapper<>();
+ queryWrapper.eq("customer_id", record.getCustomerId());
+ List<ReceiptPayment> receiptPaymentList = receiptPaymentMapper.selectList(queryWrapper);
+ BigDecimal totalAmount = BigDecimal.ZERO;
+ if(!CollectionUtils.isEmpty(receiptPaymentList)){
+ for (ReceiptPayment receiptPayment : receiptPaymentList) {
+ totalAmount = totalAmount.add(receiptPayment.getInvoiceAmount());
+ }
+ }
+ BigDecimal unReceiptPaymentAmount = record.getInvoiceAmount().subtract(totalAmount);
+ record.setReceiptPaymentAmount(totalAmount);
+ record.setUnReceiptPaymentAmount(unReceiptPaymentAmount);
+ }
+ return invoiceLedgerDtoIPage;
+ }
+
}
--
Gitblit v1.9.3