From 1ed1b9534966ce9a1e3d8bc93a7a157f604e337d Mon Sep 17 00:00:00 2001
From: Helius <wangdoubleone@gmail.com>
Date: Sun, 28 Aug 2022 13:52:04 +0800
Subject: [PATCH] fix

---
 src/main/java/cc/mrbird/febs/dapp/controller/ApiDappMemberController.java |    2 +-
 src/main/java/cc/mrbird/febs/dapp/service/impl/DappWalletServiceImpl.java |    6 +++++-
 2 files changed, 6 insertions(+), 2 deletions(-)

diff --git a/src/main/java/cc/mrbird/febs/dapp/controller/ApiDappMemberController.java b/src/main/java/cc/mrbird/febs/dapp/controller/ApiDappMemberController.java
index 9638145..7c2e17b 100644
--- a/src/main/java/cc/mrbird/febs/dapp/controller/ApiDappMemberController.java
+++ b/src/main/java/cc/mrbird/febs/dapp/controller/ApiDappMemberController.java
@@ -66,7 +66,7 @@
 
     @ApiOperation(value = "提现", notes = "提现")
     @PostMapping(value = "/withdraw")
-    public FebsResponse withdraw(@RequestBody WithdrawDto withdrawDto) {
+    public FebsResponse withdraw(@RequestBody @Valid WithdrawDto withdrawDto) {
         dappWalletService.withdraw(withdrawDto);
         return new FebsResponse().success().message("success");
     }
diff --git a/src/main/java/cc/mrbird/febs/dapp/service/impl/DappWalletServiceImpl.java b/src/main/java/cc/mrbird/febs/dapp/service/impl/DappWalletServiceImpl.java
index f4b2c0a..414db76 100644
--- a/src/main/java/cc/mrbird/febs/dapp/service/impl/DappWalletServiceImpl.java
+++ b/src/main/java/cc/mrbird/febs/dapp/service/impl/DappWalletServiceImpl.java
@@ -171,7 +171,11 @@
     public BigDecimal calPrice(PriceDto priceDto) {
         String priceStr = redisUtils.getString(AppContants.REDIS_KEY_TFC_NEW_PRICE);
 
-        return priceDto.getAmount().multiply(new BigDecimal("0.1")).divide(new BigDecimal(priceStr), 2, RoundingMode.HALF_UP);
+        BigDecimal amount = priceDto.getAmount();
+        if (priceDto.getAmount() == null) {
+            amount = BigDecimal.ZERO;
+        }
+        return amount.multiply(new BigDecimal("0.1")).divide(new BigDecimal(priceStr), 2, RoundingMode.HALF_UP);
     }
 
     @Override

--
Gitblit v1.9.1