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 |   78 +++++++++++++++++++++++++++++++++++++--
 1 files changed, 74 insertions(+), 4 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 3e4de3d..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.purchase.dto.PaymentHistoryRecordVo;
+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;
@@ -18,6 +22,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;
@@ -32,6 +37,8 @@
 
     @Autowired
     private SalesLedgerMapper salesLedgerMapper;
+    @Autowired
+    private InvoiceLedgerMapper invoiceLedgerMapper;
 
     /**
      * 鍥炴鐧昏鏂板
@@ -40,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);
         }
     }
@@ -135,7 +160,11 @@
      */
     @Override
     public IPage<ReceiptPaymentDto> bindInvoiceNoRegPage(Page page, ReceiptPaymentDto receiptPaymentDto) {
-        return receiptPaymentMapper.bindInvoiceNoRegPage(page, receiptPaymentDto);
+        IPage<ReceiptPaymentDto> receiptPaymentDtoIPage = receiptPaymentMapper.bindInvoiceNoRegPage(page, receiptPaymentDto);
+        if (receiptPaymentDto.getStatus()) {
+            receiptPaymentDtoIPage.getRecords().removeIf(receiptPaymentDto1 -> new BigDecimal("0.00").equals(receiptPaymentDto1.getNoReceiptAmount()));
+        }
+        return receiptPaymentDtoIPage;
     }
 
     /**
@@ -236,10 +265,51 @@
             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;
+    }
+
+    /**
+     * 鏌ヨ鍥炴璁板綍鍒嗛〉
+     */
+    @Override
+    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