From 5152cb7b7ef6157b28d2d625a5571ae151fe43de Mon Sep 17 00:00:00 2001
From: liyong <18434998025@163.com>
Date: 星期六, 12 七月 2025 15:01:22 +0800
Subject: [PATCH] 销售台账产品修改时候数量和开票数更新
---
src/main/java/com/ruoyi/sales/service/impl/ReceiptPaymentServiceImpl.java | 41 +++++++++++++++++++++++++++++++++++++++--
1 files changed, 39 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 e6f459a..135d3b0 100644
--- a/src/main/java/com/ruoyi/sales/service/impl/ReceiptPaymentServiceImpl.java
+++ b/src/main/java/com/ruoyi/sales/service/impl/ReceiptPaymentServiceImpl.java
@@ -4,9 +4,12 @@
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.common.utils.SecurityUtils;
+import com.ruoyi.common.utils.poi.ExcelUtil;
import com.ruoyi.sales.dto.CustomerInteractionDto;
import com.ruoyi.sales.dto.InvoiceLedgerDto;
import com.ruoyi.sales.dto.ReceiptPaymentDto;
+import com.ruoyi.sales.dto.ReceiptPaymentExeclDto;
import com.ruoyi.sales.mapper.ReceiptPaymentMapper;
import com.ruoyi.sales.mapper.SalesLedgerMapper;
import com.ruoyi.sales.pojo.ReceiptPayment;
@@ -17,6 +20,7 @@
import org.springframework.util.CollectionUtils;
import org.springframework.util.ObjectUtils;
+import javax.servlet.http.HttpServletResponse;
import java.math.BigDecimal;
import java.time.LocalDate;
import java.time.YearMonth;
@@ -239,11 +243,23 @@
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;
+ ArrayList<CustomerInteractionDto> newResult = new ArrayList<>();
+ for (int i = 0; i < result.size(); i++) {
+ CustomerInteractionDto customerInteractionDto = result.get(i);
+ if (i == 0) {
+ customerInteractionDto.setUnReceiptAmount(customerInteractionDto.getInvoiceAmount().subtract(customerInteractionDto.getReceiptAmount()));
+ }else {
+ CustomerInteractionDto customerInteractionDto1 = result.get(i-1);
+ customerInteractionDto.setUnReceiptAmount(customerInteractionDto1.getUnReceiptAmount()
+ .add(customerInteractionDto.getInvoiceAmount()).subtract(customerInteractionDto.getReceiptAmount()));
+ }
+ newResult.add(customerInteractionDto);
+ }
+ return newResult;
}
/**
@@ -253,4 +269,25 @@
public List<ReceiptPaymentDto> receiptPaymentHistoryListNoPage(ReceiptPaymentDto receiptPaymentDto) {
return receiptPaymentMapper.receiptPaymentHistoryListNoPage( receiptPaymentDto);
}
+
+ @Override
+ public void exportPaymentList(HttpServletResponse response) {
+ List<ReceiptPaymentDto> receiptPaymentDtoList = receiptPaymentMapper.bindInvoiceNoRegListAll();
+ ExcelUtil<ReceiptPaymentDto> util = new ExcelUtil<ReceiptPaymentDto>(ReceiptPaymentDto.class);
+ util.exportExcel(response, receiptPaymentDtoList, "鍥炴鐧昏");
+ }
+
+ @Override
+ public void exportPaymentList(HttpServletResponse response, List<Long> ids) {
+ if (ids == null) {
+ List<ReceiptPaymentExeclDto> receiptPaymentDtoList = receiptPaymentMapper.bindInvoiceNoRegListByIds(new ArrayList<>(), SecurityUtils.getLoginUser().getTenantId());
+ ExcelUtil<ReceiptPaymentExeclDto> util = new ExcelUtil<ReceiptPaymentExeclDto>(ReceiptPaymentExeclDto.class);
+ util.exportExcel(response, receiptPaymentDtoList, "鍥炴鐧昏");
+ }else {
+ List<ReceiptPaymentExeclDto> receiptPaymentDtoList = receiptPaymentMapper.bindInvoiceNoRegListByIds(ids,SecurityUtils.getLoginUser().getTenantId());
+ ExcelUtil<ReceiptPaymentExeclDto> util = new ExcelUtil<ReceiptPaymentExeclDto>(ReceiptPaymentExeclDto.class);
+ util.exportExcel(response, receiptPaymentDtoList, "鍥炴鐧昏");
+ }
+
+ }
}
--
Gitblit v1.9.3