From b1bef8fac3c0553f87b7047673123b23b68daa49 Mon Sep 17 00:00:00 2001
From: 陶杰 <1378534974@qq.com>
Date: 星期三, 11 十二月 2024 11:30:38 +0800
Subject: [PATCH] Merge remote-tracking branch 'origin/master-v4' into master-v4
---
src/main/java/com/mzl/flower/service/statistics/StatisticsService.java | 2 +-
1 files changed, 1 insertions(+), 1 deletions(-)
diff --git a/src/main/java/com/mzl/flower/service/statistics/StatisticsService.java b/src/main/java/com/mzl/flower/service/statistics/StatisticsService.java
index 0677b95..73d0c99 100644
--- a/src/main/java/com/mzl/flower/service/statistics/StatisticsService.java
+++ b/src/main/java/com/mzl/flower/service/statistics/StatisticsService.java
@@ -174,7 +174,7 @@
WalletWithdrawVO withdrawTotal = walletMapper.getSumWithdrawTotal();
BigDecimal sumHistoryWithdrawTotal = walletMapper.getSumHistoryWithdrawTotal();
- dto.setSupplierPendingAmount(withdrawTotal.getSupplierPendingAmount().add(sumHistoryWithdrawTotal));
+ dto.setSupplierPendingAmount(withdrawTotal.getSupplierPendingAmount());
dto.setSupplierCompleteAmount(withdrawTotal.getSupplierCompleteAmount().add(sumHistoryWithdrawTotal));
// dto.setSupplierPendingAmount(new BigDecimal(0));//TODO 供应商待提现：结算列表待结算（供应商）+供应商钱包余额
--
Gitblit v1.9.3