From efd19d385d177bfcc8d9747148ae2357e9f6aedc Mon Sep 17 00:00:00 2001
From: liyong <18434998025@163.com>
Date: 星期一, 14 七月 2025 16:19:27 +0800
Subject: [PATCH] 修改销售管理-回款登记，金额不许超过发票金额
---
src/main/java/com/ruoyi/sales/service/impl/ReceiptPaymentServiceImpl.java | 53 ++++++++++++++++++++++++++++++++++++++++++++++++-----
1 files changed, 48 insertions(+), 5 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 01a72b8..5349dab 100644
--- a/src/main/java/com/ruoyi/sales/service/impl/ReceiptPaymentServiceImpl.java
+++ b/src/main/java/com/ruoyi/sales/service/impl/ReceiptPaymentServiceImpl.java
@@ -4,12 +4,16 @@
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.InvoiceLedgerMapper;
import com.ruoyi.sales.mapper.ReceiptPaymentMapper;
import com.ruoyi.sales.mapper.SalesLedgerMapper;
+import com.ruoyi.sales.pojo.InvoiceLedger;
import com.ruoyi.sales.pojo.ReceiptPayment;
import com.ruoyi.sales.pojo.SalesLedger;
import com.ruoyi.sales.service.ReceiptPaymentService;
@@ -33,6 +37,8 @@
@Autowired
private SalesLedgerMapper salesLedgerMapper;
+ @Autowired
+ private InvoiceLedgerMapper invoiceLedgerMapper;
/**
* 鍥炴鐧昏鏂板
@@ -41,9 +47,27 @@
*/
@Override
public int receiptPaymentSaveOrUpdate(ReceiptPayment receiptPayment) {
+ ReceiptPayment byId = receiptPayment;
+ if (!ObjectUtils.isEmpty(receiptPayment.getId())){
+ byId = this.getById(receiptPayment.getId());
+ }
+ InvoiceLedger invoiceLedger = invoiceLedgerMapper.selectById(byId.getInvoiceLedgerId());
+ Page<ReceiptPaymentDto> objectPage = new Page<>();
+ ReceiptPaymentDto receiptPaymentDto = new ReceiptPaymentDto();
+ receiptPaymentDto.setInvoiceLedgerId(invoiceLedger.getId());
+ IPage<ReceiptPaymentDto> receiptPaymentDtoIPage = receiptPaymentMapper.bindInvoiceNoRegPage(objectPage, receiptPaymentDto);
+ ReceiptPaymentDto receiptPaymentDto1 = receiptPaymentDtoIPage.getRecords().get(0);
+ if (!ObjectUtils.isEmpty(byId.getId())){
+ receiptPaymentDto1.setNoReceiptAmount(receiptPaymentDto1.getNoReceiptAmount().add(byId.getReceiptPaymentAmount()));
+ }
+ if (receiptPaymentDto1.getNoReceiptAmount().compareTo(receiptPayment.getReceiptPaymentAmount())<0){
+ throw new RuntimeException("鏈鍥炴閲戦涓嶈兘澶т簬寰呭洖娆鹃噾棰�");
+ }
if(null==receiptPayment.getId()){
+
return receiptPaymentMapper.insert(receiptPayment);
}else {
+
return receiptPaymentMapper.updateById(receiptPayment);
}
}
@@ -245,7 +269,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;
}
/**
@@ -264,9 +300,16 @@
}
@Override
- public void exportPaymentList(HttpServletResponse response, ArrayList<Long> ids) {
- List<ReceiptPaymentDto> receiptPaymentDtoList = receiptPaymentMapper.bindInvoiceNoRegListByIds(ids);
- ExcelUtil<ReceiptPaymentDto> util = new ExcelUtil<ReceiptPaymentDto>(ReceiptPaymentDto.class);
- util.exportExcel(response, receiptPaymentDtoList, "鍥炴鐧昏");
+ 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