From bd5825f42960b67c23c69fc23c8aa5339cc4d084 Mon Sep 17 00:00:00 2001
From: gaoluyang <2820782392@qq.com>
Date: 星期三, 21 十月 2026 17:35:09 +0800
Subject: [PATCH] feat(erp): 付款单保存支持接收手动修改的合计付款
---
yudao-module-erp/src/main/java/cn/iocoder/yudao/module/erp/service/finance/ErpFinancePaymentServiceImpl.java | 5 ++++-
yudao-module-erp/src/main/java/cn/iocoder/yudao/module/erp/controller/admin/finance/vo/payment/ErpFinancePaymentSaveReqVO.java | 3 +++
2 files changed, 7 insertions(+), 1 deletions(-)
diff --git a/yudao-module-erp/src/main/java/cn/iocoder/yudao/module/erp/controller/admin/finance/vo/payment/ErpFinancePaymentSaveReqVO.java b/yudao-module-erp/src/main/java/cn/iocoder/yudao/module/erp/controller/admin/finance/vo/payment/ErpFinancePaymentSaveReqVO.java
index d46a107..aa9fc5b 100644
--- a/yudao-module-erp/src/main/java/cn/iocoder/yudao/module/erp/controller/admin/finance/vo/payment/ErpFinancePaymentSaveReqVO.java
+++ b/yudao-module-erp/src/main/java/cn/iocoder/yudao/module/erp/controller/admin/finance/vo/payment/ErpFinancePaymentSaveReqVO.java
@@ -37,6 +37,9 @@
@NotNull(message = "浼樻儬閲戦涓嶈兘涓虹┖")
private BigDecimal discountPrice;
+ @Schema(description = "鍚堣浠樻锛屽崟浣嶏細鍏冦�備笉浼犳椂鎸変粯娆炬槑缁嗘眹鎬�", example = "11600")
+ private BigDecimal totalPrice;
+
@Schema(description = "澶囨敞", example = "浣犵寽")
private String remark;
diff --git a/yudao-module-erp/src/main/java/cn/iocoder/yudao/module/erp/service/finance/ErpFinancePaymentServiceImpl.java b/yudao-module-erp/src/main/java/cn/iocoder/yudao/module/erp/service/finance/ErpFinancePaymentServiceImpl.java
index 64dd7b2..7e6255d 100644
--- a/yudao-module-erp/src/main/java/cn/iocoder/yudao/module/erp/service/finance/ErpFinancePaymentServiceImpl.java
+++ b/yudao-module-erp/src/main/java/cn/iocoder/yudao/module/erp/service/finance/ErpFinancePaymentServiceImpl.java
@@ -160,7 +160,10 @@
}
private void calculateTotalPrice(ErpFinancePaymentDO payment, List<ErpFinancePaymentItemDO> paymentItems) {
- payment.setTotalPrice(getSumValue(paymentItems, ErpFinancePaymentItemDO::getPaymentPrice, BigDecimal::add, BigDecimal.ZERO));
+ // 鍚堣浠樻鍏佽鐢ㄦ埛鎵嬪姩淇敼锛屾湭浼犳椂鍐嶆寜浠樻鏄庣粏姹囨��
+ if (payment.getTotalPrice() == null) {
+ payment.setTotalPrice(getSumValue(paymentItems, ErpFinancePaymentItemDO::getPaymentPrice, BigDecimal::add, BigDecimal.ZERO));
+ }
payment.setPaymentPrice(payment.getTotalPrice().subtract(payment.getDiscountPrice()));
}
--
Gitblit v1.9.3