From 4afb279afec6c0a6684f88529d68057ad709b870 Mon Sep 17 00:00:00 2001
From: chenrui <1187576398@qq.com>
Date: 星期四, 05 六月 2025 16:33:10 +0800
Subject: [PATCH] 客户往来bug修复
---
src/main/java/com/ruoyi/purchase/service/impl/PaymentRegistrationServiceImpl.java | 40 +++++++++++++++++++++++++++++++++++++---
1 files changed, 37 insertions(+), 3 deletions(-)
diff --git a/src/main/java/com/ruoyi/purchase/service/impl/PaymentRegistrationServiceImpl.java b/src/main/java/com/ruoyi/purchase/service/impl/PaymentRegistrationServiceImpl.java
index ec355bd..3f96818 100644
--- a/src/main/java/com/ruoyi/purchase/service/impl/PaymentRegistrationServiceImpl.java
+++ b/src/main/java/com/ruoyi/purchase/service/impl/PaymentRegistrationServiceImpl.java
@@ -11,6 +11,7 @@
import com.ruoyi.common.utils.DateUtils;
import com.ruoyi.common.utils.SecurityUtils;
import com.ruoyi.framework.security.LoginUser;
+import com.ruoyi.purchase.dto.PaymentHistoryRecordVo;
import com.ruoyi.purchase.dto.PaymentLedgerDto;
import com.ruoyi.purchase.dto.PaymentRegistrationDto;
import com.ruoyi.purchase.mapper.*;
@@ -46,8 +47,6 @@
private PaymentRegistrationMapper paymentRegistrationMapper;
private PurchaseLedgerMapper purchaseLedgerMapper;
-
- private InvoicePurchaseMapper invoicePurchaseMapper;
private SalesLedgerMapper salesLedgerMapper;
@@ -203,6 +202,7 @@
for (SupplierManage supplierManage : supplierManages) {
Map<String, Object> res = new HashMap<>();
res.put("supplierName", supplierManage.getSupplierName());
+ res.put("supplierId", supplierManage.getId());
// 搴斾粯閲戦璁＄畻
BigDecimal payableAmount = BigDecimal.ZERO;
@@ -268,7 +268,6 @@
new LambdaQueryWrapper<ProductRecord>().eq(ProductRecord::getTicketRegistrationId, ticketRegistration.getId())
).stream()
.map(ProductRecord::getTicketsNum)
- .map(BigDecimal::new)
.filter(Objects::nonNull)
.reduce(BigDecimal.ZERO, BigDecimal::add);
detail.put("voteCount", voteCount);
@@ -345,6 +344,41 @@
return result;
}
+ /**
+ * 鏌ヨ浠樻鐧昏鍒楄〃
+ *
+ * @param paymentRegistrationDto 浠樻鐧昏
+ * @return 浠樻鐧昏闆嗗悎
+ */
+ @Override
+ public List<PaymentRegistrationDto> paymentHistoryList(PaymentRegistrationDto paymentRegistrationDto) {
+ return paymentRegistrationMapper.paymentHistoryList(paymentRegistrationDto);
+ }
+
+ /**
+ * 鏌ヨ渚涘簲鍟嗗線鏉ヨ褰�
+ * @param supplierId
+ * @return
+ */
+ @Override
+ public List<PaymentHistoryRecordVo> getPaymentRecordList(Long supplierId) {
+ List<PaymentHistoryRecordVo> paymentRecordList = paymentRegistrationMapper.getPaymentRecordList(supplierId);
+ if(!CollectionUtils.isEmpty(paymentRecordList)) {
+ // 搴斾粯閲戦璁＄畻
+ BigDecimal amountTotal = BigDecimal.ZERO;
+ for (PaymentHistoryRecordVo paymentHistoryRecordVo : paymentRecordList) {
+ if(paymentHistoryRecordVo.getType() == 0){
+ amountTotal = amountTotal.subtract(paymentHistoryRecordVo.getCurrentPaymentAmount());
+ }
+ if(paymentHistoryRecordVo.getType() == 1){
+ amountTotal = amountTotal.add(paymentHistoryRecordVo.getInvoiceAmount());
+ }
+ paymentHistoryRecordVo.setPayableAmount(amountTotal);
+ }
+ }
+ return paymentRecordList;
+ }
+
// 鎵归噺鏌ヨ閲囪喘鍙拌处锛堝綋鏈堬級
private Map<Long, List<PurchaseLedger>> batchQueryPurchaseLedgers(List<Long> supplierIds, LocalDate startDate, LocalDate endDate) {
LambdaQueryWrapper<PurchaseLedger> query = new LambdaQueryWrapper<>();
--
Gitblit v1.9.3