From 78082b601d0eda9b820fbeba9a01fbfeb5309692 Mon Sep 17 00:00:00 2001 From: 陶杰 <1378534974@qq.com> Date: 星期五, 08 十一月 2024 14:27:51 +0800 Subject: [PATCH] 1.供应商-钱包:统计修改 --- src/main/java/com/mzl/flower/service/impl/wallet/WalletServiceImpl.java | 6 +++++- 1 files changed, 5 insertions(+), 1 deletions(-) diff --git a/src/main/java/com/mzl/flower/service/impl/wallet/WalletServiceImpl.java b/src/main/java/com/mzl/flower/service/impl/wallet/WalletServiceImpl.java index 1f3d758..161cc3e 100644 --- a/src/main/java/com/mzl/flower/service/impl/wallet/WalletServiceImpl.java +++ b/src/main/java/com/mzl/flower/service/impl/wallet/WalletServiceImpl.java @@ -171,8 +171,12 @@ BigDecimal saleDeduceAmount = walletReduceService.getSaleReduceAmount(queryWalletAmountDTO); saleDeduceAmount = saleDeduceAmount != null ? saleDeduceAmount : BigDecimal.ZERO; + // 集货站运费 + BigDecimal stationFeeAmount = walletReduceService.getStationFeeAmount(queryWalletAmountDTO); + stationFeeAmount = stationFeeAmount != null ? stationFeeAmount : BigDecimal.ZERO; + // 总扣款 - BigDecimal deduceAmount = checkDeduceAmount.add(saleDeduceAmount); + BigDecimal deduceAmount = checkDeduceAmount.add(saleDeduceAmount).add(stationFeeAmount); return deduceAmount; } -- Gitblit v1.9.3