From 63ccaee5545740122a9d58983aa75d9da9de7530 Mon Sep 17 00:00:00 2001
From: chenrui <1187576398@qq.com>
Date: 星期一, 26 五月 2025 13:46:11 +0800
Subject: [PATCH] 回款登记功能修改
---
src/main/java/com/ruoyi/sales/service/impl/ReceiptPaymentServiceImpl.java | 42 +++++++++++++++++++++++++++++++++++++++++-
1 files changed, 41 insertions(+), 1 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 93d3783..7ee2762 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,15 @@
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.sales.dto.InvoiceLedgerDto;
import com.ruoyi.sales.dto.ReceiptPaymentDto;
import com.ruoyi.sales.mapper.ReceiptPaymentMapper;
import com.ruoyi.sales.pojo.ReceiptPayment;
import com.ruoyi.sales.service.ReceiptPaymentService;
import org.springframework.beans.factory.annotation.Autowired;
import org.springframework.stereotype.Service;
+import org.springframework.util.CollectionUtils;
+import org.springframework.util.ObjectUtils;
import java.math.BigDecimal;
import java.time.LocalDate;
@@ -67,7 +70,23 @@
*/
@Override
public IPage<ReceiptPaymentDto> receiptPaymentListPage(Page page, ReceiptPaymentDto receiptPaymentDto) {
- return receiptPaymentMapper.receiptPaymentListPage(page, receiptPaymentDto);
+ // 璁＄畻鍒嗛〉鍓峱age.current-1 * limit鏉℃暟鐨勭患鍚堣绠楀凡缁忔敹鍥炵殑鍥炴閲戦
+ // 璁＄畻宸茬粡鍒嗛〉鐨勬潯鏁�
+ long total = (page.getCurrent() - 1) * page.getSize();
+ BigDecimal receiptAmount = receiptPaymentMapper.getReceiptAmount(receiptPaymentDto.getCustomerId(), total);
+ if(ObjectUtils.isEmpty(receiptAmount)){
+ receiptAmount = BigDecimal.ZERO;
+ }
+ IPage<ReceiptPaymentDto> iPage = receiptPaymentMapper.receiptPaymentListPage(page, receiptPaymentDto);
+ // 寮�绁ㄦ�婚噾棰�
+ BigDecimal invoiceTotal = CollectionUtils.isEmpty(iPage.getRecords()) ? BigDecimal.ZERO : iPage.getRecords().get(0).getInvoiceTotal();
+ // 褰撳墠搴旀敹閲戦
+ BigDecimal currentUnReceiptAmount = invoiceTotal.subtract(receiptAmount);
+ for (ReceiptPaymentDto record : iPage.getRecords()) {
+ currentUnReceiptAmount = currentUnReceiptAmount.subtract(record.getReceiptPaymentAmount());
+ record.setNoReceiptAmount(currentUnReceiptAmount);
+ }
+ return iPage;
}
/**
@@ -100,4 +119,25 @@
return totalContractAmount;
}
+
+ /**
+ * 鏌ヨ宸茬粡缁戝畾鍙戠エ鐨勫紑绁ㄥ彴璐�
+ * @param page
+ * @param receiptPaymentDto
+ * @return
+ */
+ @Override
+ public IPage<ReceiptPaymentDto> bindInvoiceNoRegPage(Page page, ReceiptPaymentDto receiptPaymentDto) {
+ return receiptPaymentMapper.bindInvoiceNoRegPage(page, receiptPaymentDto);
+ }
+
+ /**
+ * 寮�绁ㄥ彴璐﹁鎯�
+ * @param id
+ * @return
+ */
+ @Override
+ public InvoiceLedgerDto invoiceInfo(Integer id) {
+ return receiptPaymentMapper.invoiceInfo(id);
+ }
}
--
Gitblit v1.9.3