From 360f96ffb62a0ba418c0de0a4a5b5f537912872e Mon Sep 17 00:00:00 2001
From: liding <756868258@qq.com>
Date: 星期一, 26 五月 2025 14:05:08 +0800
Subject: [PATCH] 首页数据
---
src/main/java/com/ruoyi/sales/service/impl/InvoiceLedgerServiceImpl.java | 31 ++++++-------------------------
1 files changed, 6 insertions(+), 25 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 f561a72..696f72e 100644
--- a/src/main/java/com/ruoyi/sales/service/impl/InvoiceLedgerServiceImpl.java
+++ b/src/main/java/com/ruoyi/sales/service/impl/InvoiceLedgerServiceImpl.java
@@ -13,11 +13,8 @@
import com.ruoyi.sales.mapper.InvoiceLedgerFileMapper;
import com.ruoyi.sales.mapper.InvoiceLedgerMapper;
import com.ruoyi.sales.mapper.InvoiceRegistrationProductMapper;
-import com.ruoyi.sales.mapper.ReceiptPaymentMapper;
import com.ruoyi.sales.pojo.InvoiceLedger;
import com.ruoyi.sales.pojo.InvoiceLedgerFile;
-import com.ruoyi.sales.pojo.InvoiceRegistrationProduct;
-import com.ruoyi.sales.pojo.ReceiptPayment;
import com.ruoyi.sales.service.InvoiceLedgerService;
import org.apache.commons.collections4.CollectionUtils;
import org.springframework.beans.BeanUtils;
@@ -33,7 +30,6 @@
import java.math.BigDecimal;
import java.time.LocalDate;
import java.time.YearMonth;
-import java.util.Collections;
import java.util.List;
import java.util.Objects;
import java.util.UUID;
@@ -242,20 +238,6 @@
@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;
}
@@ -272,13 +254,12 @@
// 鎵ц鏌ヨ骞惰绠楁�诲拰
List<InvoiceLedger> invoiceLedgers = invoiceLedgerMapper.selectList(queryWrapper);
-// BigDecimal totalContractAmount = invoiceLedgers.stream()
-// .map(InvoiceLedger::getInvoiceAmount)
-// .filter(Objects::nonNull)
-// .reduce(BigDecimal.ZERO, BigDecimal::add);
-//
-// return totalContractAmount;
- return null;
+ BigDecimal totalContractAmount = invoiceLedgers.stream()
+ .map(InvoiceLedger::getInvoiceTotal)
+ .filter(Objects::nonNull)
+ .reduce(BigDecimal.ZERO, BigDecimal::add);
+
+ return totalContractAmount;
}
/**
--
Gitblit v1.9.3