From 862028f5d3433aecec6bf0cfd8bd015dc722b9df Mon Sep 17 00:00:00 2001
From: chenrui <1187576398@qq.com>
Date: 星期五, 06 六月 2025 14:09:50 +0800
Subject: [PATCH] 销售合同号/部门新增编号
---
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