From 0d83a54d5f3ae08fe0ee4b3cd3fd72e94e2767e1 Mon Sep 17 00:00:00 2001
From: xuhy <3313886187@qq.com>
Date: 星期二, 14 十月 2025 09:32:13 +0800
Subject: [PATCH] Merge remote-tracking branch 'origin/master'
---
ruoyi-system/src/main/java/com/ruoyi/system/service/impl/TErpProcurementServiceImpl.java | 5 +++++
1 files changed, 5 insertions(+), 0 deletions(-)
diff --git a/ruoyi-system/src/main/java/com/ruoyi/system/service/impl/TErpProcurementServiceImpl.java b/ruoyi-system/src/main/java/com/ruoyi/system/service/impl/TErpProcurementServiceImpl.java
index e75749d..1a7583f 100644
--- a/ruoyi-system/src/main/java/com/ruoyi/system/service/impl/TErpProcurementServiceImpl.java
+++ b/ruoyi-system/src/main/java/com/ruoyi/system/service/impl/TErpProcurementServiceImpl.java
@@ -391,6 +391,9 @@
BigDecimal add = BigDecimal.ZERO;
+
+ BigDecimal supplierCommissionPrice = BigDecimal.ZERO;
+
for (AddProcurementDto dto : value) {
TErpProcurementGoods tErpProcurementGoods = new TErpProcurementGoods();
tErpProcurementGoods.setProcurementId(tErpProcurement.getId());
@@ -410,6 +413,7 @@
tErpProcurementGoods.setSupplierId(supplierClinicId);
tErpProcurementGoods.setRecvMerchantNo(supplier.getRecvMerchantNo());
tErpProcurementGoods.setSupplierMoney(dto.getSalesAmount().subtract(dto.getPlatformCommissionPrice()));
+ supplierCommissionPrice = supplierCommissionPrice.add(tErpProcurementGoods.getSupplierMoney().multiply(BigDecimal.valueOf(dto.getPurchaseCount())));
if (tErpProcurementGoods.getSupplierMoney().doubleValue() < 0) {
throw new RuntimeException("平台抽成不能大于售卖价格");
}
@@ -422,6 +426,7 @@
if (tErpProcurement.getMoney().doubleValue() < 0) {
throw new RuntimeException("金额设置错误，请联系平台管理员");
}
+ tErpProcurement.setSupplierMoney(supplierCommissionPrice);
this.save(tErpProcurement);
tErpProcurementGoods1.forEach(e -> e.setProcurementId(tErpProcurement.getId()));
erpProcurementGoodsService.saveBatch(tErpProcurementGoods1);
--
Gitblit v1.7.1