From d94e7d6bbf23698c27147a60ee866c64b2d43775 Mon Sep 17 00:00:00 2001
From: 陶杰 <1378534974@qq.com>
Date: 星期四, 14 十一月 2024 09:37:32 +0800
Subject: [PATCH] Merge remote-tracking branch 'origin/master-v4' into master-v4
---
src/main/java/com/mzl/flower/web/v2/wallet/WalletController.java | 13 ++++++++++++-
1 files changed, 12 insertions(+), 1 deletions(-)
diff --git a/src/main/java/com/mzl/flower/web/v2/wallet/WalletController.java b/src/main/java/com/mzl/flower/web/v2/wallet/WalletController.java
index 7f44be0..208b7b0 100644
--- a/src/main/java/com/mzl/flower/web/v2/wallet/WalletController.java
+++ b/src/main/java/com/mzl/flower/web/v2/wallet/WalletController.java
@@ -19,6 +19,7 @@
import com.mzl.flower.entity.wallet.WalletDO;
import javax.validation.constraints.Positive;
+import java.math.BigDecimal;
/**
* @author @TaoJie
@@ -66,9 +67,19 @@
if(null==currentSupplier){
throw new ValidationException("供应商不能为空");
}
+ final WalletDO walletDO = walletService.getCurrentSupplier();
+ if(null!=walletDO){
+ // 根据当前供应商获取待结算的钱
+ BigDecimal waittingSettlementAmount = walletService.getWaittingSettlementAmount(walletDO);
+ walletDO.setSettlingAmount(waittingSettlementAmount);
+ // 总交易额度
+ walletDO.setTotalTransactionAmount(walletService.getSupplierTotalTransactionAmount(walletDO));
+ // 总扣款数量
+ walletDO.setTotalDeduction(walletService.getSupplierDeductAmount(walletDO));
+ }
- return returnData(R.SUCCESS.getCode(), walletService.getCurrentSupplier());
+ return returnData(R.SUCCESS.getCode(), walletDO);
}
@GetMapping("/page")
--
Gitblit v1.9.3