From 6c823dd44dbde79f008001a2a11e7bf9bc6bf8cc Mon Sep 17 00:00:00 2001 From: cloudroam <cloudroam> Date: 星期三, 04 十二月 2024 18:15:44 +0800 Subject: [PATCH] fix:合伙人列表操作日志 --- src/main/java/com/mzl/flower/service/impl/wallet/WalletServiceImpl.java | 17 +++++++++++++---- 1 files changed, 13 insertions(+), 4 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..0e784cd 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 @@ -164,15 +164,24 @@ queryWalletAmountDTO.setStartTime(getWalletOnLineTime()); queryWalletAmountDTO.setUserId(walletDO.getUserId()); - // 质检扣款 - BigDecimal checkDeduceAmount = walletReduceService.getCheckReduceAmount(queryWalletAmountDTO); - checkDeduceAmount = checkDeduceAmount != null ? checkDeduceAmount : BigDecimal.ZERO; + // 质检扣款(缺货和补货) + BigDecimal checkReplaceLockAmount = walletReduceService.getCheckLackReplaceAmount(queryWalletAmountDTO); + checkReplaceLockAmount = checkReplaceLockAmount != null ? checkReplaceLockAmount : BigDecimal.ZERO; + + // 质检扣款(降级) + BigDecimal checkReduceAmount = walletReduceService.getCheckReduceAmount(queryWalletAmountDTO); + checkReduceAmount = checkReduceAmount != null ? checkReduceAmount : BigDecimal.ZERO; + // 售后扣款 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 = checkReplaceLockAmount.add(checkReduceAmount).add(saleDeduceAmount).add(stationFeeAmount); return deduceAmount; } -- Gitblit v1.9.3