From 96eecc97de7fc863fc76b63294d4c12bd9683ae4 Mon Sep 17 00:00:00 2001
From: chenrui <1187576398@qq.com>
Date: 星期二, 20 五月 2025 15:36:40 +0800
Subject: [PATCH] 回款台账
---
src/main/java/com/ruoyi/sales/service/impl/SalesLedgerServiceImpl.java | 26 ++------------------------
1 files changed, 2 insertions(+), 24 deletions(-)
diff --git a/src/main/java/com/ruoyi/sales/service/impl/SalesLedgerServiceImpl.java b/src/main/java/com/ruoyi/sales/service/impl/SalesLedgerServiceImpl.java
index 9163f8b..c20172e 100644
--- a/src/main/java/com/ruoyi/sales/service/impl/SalesLedgerServiceImpl.java
+++ b/src/main/java/com/ruoyi/sales/service/impl/SalesLedgerServiceImpl.java
@@ -103,30 +103,6 @@
LambdaQueryWrapper<SalesLedgerProduct> productWrapper = new LambdaQueryWrapper<>();
productWrapper.eq(SalesLedgerProduct::getSalesLedgerId, salesLedger.getId());
List<SalesLedgerProduct> products = salesLedgerProductMapper.selectList(productWrapper);
- // 鏌ヨ鏈紑绁ㄩ噾棰�/鏈紑绁ㄦ暟
- if (CollectionUtils.isNotEmpty(products)) {
- QueryWrapper<InvoiceRegistrationProduct> productQueryWrapper = new QueryWrapper<>();
- List<Long> productIds = products.stream().map(SalesLedgerProduct::getId).collect(Collectors.toList());
- productQueryWrapper.in("sales_ledger_product_id", productIds);
- List<InvoiceRegistrationProduct> invoiceRegistrationProductList = invoiceRegistrationProductMapper.selectList(productQueryWrapper);
- if(CollectionUtils.isNotEmpty(invoiceRegistrationProductList)){
- for (SalesLedgerProduct product : products) {
- for (InvoiceRegistrationProduct invoiceRegistrationProduct : invoiceRegistrationProductList) {
- Integer salesLedgerProductId = invoiceRegistrationProduct.getSalesLedgerProductId();
- Long id = product.getId();
- if( null != id && null != salesLedgerProductId && id == salesLedgerProductId.longValue()){
- product.setFutureTickets(Long.valueOf(invoiceRegistrationProduct.getNoInvoiceNum()));
- product.setFutureTicketsAmount(invoiceRegistrationProduct.getNoInvoiceAmount());
- }
- }
- }
- }else {
- for (SalesLedgerProduct product : products) {
- product.setFutureTickets(product.getQuantity().longValue());
- product.setFutureTicketsAmount(product.getTaxInclusiveTotalPrice());
- }
- }
- }
// 3.鏌ヨ涓婁紶鏂囦欢
LambdaQueryWrapper<CommonFile> salesLedgerFileWrapper = new LambdaQueryWrapper<>();
@@ -369,6 +345,8 @@
if (!insertList.isEmpty()) {
for (SalesLedgerProduct salesLedgerProduct : insertList) {
salesLedgerProduct.setType(type);
+ salesLedgerProduct.setNoInvoiceNum(salesLedgerProduct.getQuantity().intValue());
+ salesLedgerProduct.setNoInvoiceAmount(salesLedgerProduct.getTaxInclusiveTotalPrice());
salesLedgerProductMapper.insert(salesLedgerProduct);
}
}
--
Gitblit v1.9.3