From 6c45b39a2b7541ec5bb1f69dae748cdb7bbfdb73 Mon Sep 17 00:00:00 2001
From: liujie <1793218484@qq.com>
Date: 星期二, 28 十月 2025 16:27:13 +0800
Subject: [PATCH] 修改bug
---
ruoyi-system/src/main/java/com/ruoyi/system/service/impl/TErpProcurementServiceImpl.java | 19 ++++++++++++++-----
1 files changed, 14 insertions(+), 5 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 7712a40..90cc14b 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
@@ -404,8 +404,11 @@
BigDecimal all = BigDecimal.ZERO;
for (AddProcurementDto addProcurementDto : value) {
- BigDecimal multiply = addProcurementDto.getGoodsSalesAmount().multiply(BigDecimal.valueOf(addProcurementDto.getPurchaseCount()));
- all = all.add(multiply);
+ if(addProcurementDto.getGoodsSalesAmount()!= null && addProcurementDto.getPurchaseCount()!=null){
+ BigDecimal multiply = addProcurementDto.getGoodsSalesAmount().multiply(BigDecimal.valueOf(addProcurementDto.getPurchaseCount()));
+ all = all.add(multiply);
+ }
+
}
tErpProcurement.setPayMoney(all);
AddProcurementDto addProcurementDto = value.get(0);
@@ -436,17 +439,23 @@
}
tErpProcurementGoods.setPurchasePrice(dto.getGoodsSalesAmount());
tErpProcurementGoods.setSalesAmount(dto.getSalesAmount());
- tErpProcurementGoods.setTotalPrice(dto.getGoodsSalesAmount().multiply(new BigDecimal(dto.getPurchaseCount())));
+ if(dto.getPurchaseCount()!=null && dto.getGoodsSalesAmount()!=null){
+ tErpProcurementGoods.setTotalPrice(dto.getGoodsSalesAmount().multiply(new BigDecimal(dto.getPurchaseCount())));
+ }
tErpProcurementGoods.setPurchaseCount(dto.getPurchaseCount());
tErpProcurementGoods.setSupplierId(supplierClinicId);
tErpProcurementGoods.setRecvMerchantNo(supplier.getRecvMerchantNo());
tErpProcurementGoods.setSupplierMoney(dto.getGoodsSalesAmount().subtract(dto.getPlatformCommissionPrice()));
- supplierCommissionPrice = supplierCommissionPrice.add(tErpProcurementGoods.getSupplierMoney().multiply(BigDecimal.valueOf(dto.getPurchaseCount())));
+ if(dto.getPurchaseCount()!=null){
+ supplierCommissionPrice = supplierCommissionPrice.add(tErpProcurementGoods.getSupplierMoney().multiply(BigDecimal.valueOf(dto.getPurchaseCount())));
+ }
if (tErpProcurementGoods.getSupplierMoney().doubleValue() < 0) {
throw new RuntimeException("平台抽成不能大于售卖价格");
}
- add = add.add(dto.getPlatformCommissionPrice().multiply(BigDecimal.valueOf(dto.getPurchaseCount())));
+ if(dto.getPurchaseCount()!=null){
+ add = add.add(dto.getPlatformCommissionPrice().multiply(BigDecimal.valueOf(dto.getPurchaseCount())));
+ }
tErpProcurementGoods1.add(tErpProcurementGoods);
}
BigDecimal bigDecimal = tErpProcurement.getPayMoney().multiply(BigDecimal.valueOf(0.0038)).setScale(2, RoundingMode.HALF_UP);
--
Gitblit v1.7.1