From 5826a876f9c1a4fb08a0d937c199e7717c51282b Mon Sep 17 00:00:00 2001
From: chenrui <1187576398@qq.com>
Date: 星期四, 05 六月 2025 17:25:27 +0800
Subject: [PATCH] 客户往来bug修复

---
 src/main/java/com/ruoyi/purchase/service/impl/TicketRegistrationServiceImpl.java |   13 +++++++------
 1 files changed, 7 insertions(+), 6 deletions(-)

diff --git a/src/main/java/com/ruoyi/purchase/service/impl/TicketRegistrationServiceImpl.java b/src/main/java/com/ruoyi/purchase/service/impl/TicketRegistrationServiceImpl.java
index f007f6e..d7c512e 100644
--- a/src/main/java/com/ruoyi/purchase/service/impl/TicketRegistrationServiceImpl.java
+++ b/src/main/java/com/ruoyi/purchase/service/impl/TicketRegistrationServiceImpl.java
@@ -90,16 +90,17 @@
             List<Long> ids = ticketRegistrationList.stream().map(TicketRegistration::getId).collect(Collectors.toList());
             List<PaymentRegistrationDto> paymentRegistrationDtoList = paymentRegistrationMapper.countPaymentTotalByTicketRegId(ids);
             for (TicketRegistration registration : ticketRegistrationList) {
+                BigDecimal paymentAmountTotal = BigDecimal.ZERO;
                 for (PaymentRegistrationDto paymentRegistrationDto : paymentRegistrationDtoList) {
                     if(registration.getId().equals(paymentRegistrationDto.getTicketRegistrationId())){
-                        BigDecimal paymentAmountTotal = paymentRegistrationDto.getPaymentAmountTotal();
-                        BigDecimal invoiceAmount = registration.getInvoiceAmount();
-                        registration.setPaymentAmountTotal(paymentAmountTotal);
-                        BigDecimal subtractAmount = invoiceAmount.subtract(paymentAmountTotal);
-                        registration.setUnPaymentAmountTotal(subtractAmount);
+                        paymentAmountTotal = paymentRegistrationDto.getPaymentAmountTotal();
                         break;
                     }
                 }
+                BigDecimal invoiceAmount = registration.getInvoiceAmount();
+                BigDecimal subtractAmount = invoiceAmount.subtract(paymentAmountTotal);
+                registration.setPaymentAmountTotal(paymentAmountTotal);
+                registration.setUnPaymentAmountTotal(subtractAmount);
             }
         }
 
@@ -299,7 +300,7 @@
                 // 璁$畻 futureTickets锛堢洿鎺ヤ娇鐢� BigDecimal 璁$畻锛岄伩鍏嶇簿搴︿涪澶憋級
                 product.setFutureTickets(
                         product.getQuantity()
-                                .subtract(BigDecimal.valueOf(product.getTicketsNum()))
+                                .subtract(product.getTicketsNum())
                 );
 
                 // 璁$畻 futureTicketsAmount

--
Gitblit v1.9.3