From 60117d199e9345ac3e5287f1e82d51f74f14dddb Mon Sep 17 00:00:00 2001
From: maven <2163098428@qq.com>
Date: 星期二, 13 一月 2026 15:57:23 +0800
Subject: [PATCH] yys 付款，回款改为绑定台账，产品
---
src/main/java/com/ruoyi/sales/service/impl/ReceiptPaymentServiceImpl.java | 81 +++++++++++++++++++++++++++++++++++-----
1 files changed, 71 insertions(+), 10 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 fe9550b..e93d62f 100644
--- a/src/main/java/com/ruoyi/sales/service/impl/ReceiptPaymentServiceImpl.java
+++ b/src/main/java/com/ruoyi/sales/service/impl/ReceiptPaymentServiceImpl.java
@@ -10,13 +10,18 @@
import com.ruoyi.sales.dto.InvoiceLedgerDto;
import com.ruoyi.sales.dto.ReceiptPaymentDto;
import com.ruoyi.sales.dto.ReceiptPaymentExeclDto;
+import com.ruoyi.sales.mapper.InvoiceLedgerMapper;
import com.ruoyi.sales.mapper.ReceiptPaymentMapper;
import com.ruoyi.sales.mapper.SalesLedgerMapper;
+import com.ruoyi.sales.mapper.SalesLedgerProductMapper;
+import com.ruoyi.sales.pojo.InvoiceLedger;
import com.ruoyi.sales.pojo.ReceiptPayment;
import com.ruoyi.sales.pojo.SalesLedger;
+import com.ruoyi.sales.pojo.SalesLedgerProduct;
import com.ruoyi.sales.service.ReceiptPaymentService;
import org.springframework.beans.factory.annotation.Autowired;
import org.springframework.stereotype.Service;
+import org.springframework.transaction.annotation.Transactional;
import org.springframework.util.CollectionUtils;
import org.springframework.util.ObjectUtils;
@@ -36,18 +41,46 @@
@Autowired
private SalesLedgerMapper salesLedgerMapper;
+ @Autowired
+ private SalesLedgerProductMapper salesLedgerProductMapper;
+ @Autowired
+ private InvoiceLedgerMapper invoiceLedgerMapper;
+
/**
* 鍥炴鐧昏鏂板
- * @param receiptPayment
+ * @param receiptPaymentList
* @return
*/
@Override
- public int receiptPaymentSaveOrUpdate(ReceiptPayment receiptPayment) {
- if(null==receiptPayment.getId()){
- return receiptPaymentMapper.insert(receiptPayment);
- }else {
- return receiptPaymentMapper.updateById(receiptPayment);
+ @Transactional(rollbackFor = Exception.class)
+ public int receiptPaymentSaveOrUpdate(List<ReceiptPayment> receiptPaymentList) {
+ for (ReceiptPayment receiptPayment : receiptPaymentList) {
+ ReceiptPayment byId = receiptPayment;
+ if (!ObjectUtils.isEmpty(receiptPayment.getId())){
+ receiptPayment = this.getById(receiptPayment.getId());
+ }
+// InvoiceLedger invoiceLedger = invoiceLedgerMapper.selectById(byId.getInvoiceLedgerId());
+ SalesLedger salesLedger = salesLedgerMapper.selectById(receiptPayment.getSalesLedgerId());
+ if(null==salesLedger) throw new RuntimeException("鏈壘鍒伴攢鍞崟");
+ // 宸插洖娆鹃噾棰�
+ SalesLedgerProduct salesLedgerProduct = salesLedgerProductMapper.selectById(receiptPayment.getSalesLedgerProductId());
+ if(null==salesLedgerProduct) throw new RuntimeException("鏈壘鍒伴攢鍞崟浜у搧");
+ if (salesLedgerProduct.getPendingInvoiceTotal().compareTo(receiptPayment.getReceiptPaymentAmount())<0){
+ throw new RuntimeException("鏈鍥炴閲戦涓嶈兘澶т簬寰呭洖娆鹃噾棰�");
+ }
+ if(null==receiptPayment.getId()){
+ salesLedgerProduct.setInvoiceTotal(salesLedgerProduct.getInvoiceTotal().add(receiptPayment.getReceiptPaymentAmount()));
+ salesLedgerProduct.setPendingInvoiceTotal(salesLedgerProduct.getTaxInclusiveTotalPrice().subtract(salesLedgerProduct.getInvoiceTotal()));
+ receiptPaymentMapper.insert(receiptPayment);
+ }else {
+ BigDecimal subtract = receiptPayment.getReceiptPaymentAmount().subtract(byId.getReceiptPaymentAmount());
+ salesLedgerProduct.setInvoiceTotal(salesLedgerProduct.getInvoiceTotal().add(subtract));
+ salesLedgerProduct.setPendingInvoiceTotal(salesLedgerProduct.getTaxInclusiveTotalPrice().subtract(salesLedgerProduct.getInvoiceTotal()));
+ receiptPaymentMapper.updateById(receiptPayment);
+ }
+ salesLedgerProductMapper.updateById(salesLedgerProduct);
}
+ return 1;
}
/**
@@ -139,9 +172,25 @@
@Override
public IPage<ReceiptPaymentDto> bindInvoiceNoRegPage(Page page, ReceiptPaymentDto receiptPaymentDto) {
IPage<ReceiptPaymentDto> receiptPaymentDtoIPage = receiptPaymentMapper.bindInvoiceNoRegPage(page, receiptPaymentDto);
- if (receiptPaymentDto.getStatus()) {
- receiptPaymentDtoIPage.getRecords().removeIf(receiptPaymentDto1 -> new BigDecimal("0.00").equals(receiptPaymentDto1.getNoReceiptAmount()));
- }
+// if (receiptPaymentDto.getStatus()) {
+// long count = receiptPaymentDtoIPage.getRecords()
+// .stream()
+// .filter(receiptPaymentDto1 -> new BigDecimal("0.00").equals(receiptPaymentDto1.getNoReceiptAmount()))
+// .count();
+// receiptPaymentDtoIPage
+// .getRecords()
+// .removeIf(receiptPaymentDto1 -> new BigDecimal("0.00").equals(receiptPaymentDto1.getNoReceiptAmount()));
+// receiptPaymentDtoIPage.setTotal(receiptPaymentDtoIPage.getTotal() - count);
+// }
+ receiptPaymentDtoIPage.getRecords().forEach(item -> {
+ // 姣旇緝鍥炴閲戦 == 寰呭洖娆鹃噾棰�
+ if (item.getInvoiceTotal().compareTo(item.getReceiptPaymentAmountTotal()) == 0) {
+ item.setStatusName("宸插畬鎴愬洖娆�");
+ }else{
+ item.setStatusName("鏈畬鎴愬洖娆�");
+ }
+
+ });
return receiptPaymentDtoIPage;
}
@@ -247,7 +296,19 @@
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;
}
/**
--
Gitblit v1.9.3