From ddb907e6378163ad1218e20aa1c656aafe7ebf0f Mon Sep 17 00:00:00 2001
From: Helius <wangdoubleone@gmail.com>
Date: Tue, 16 Aug 2022 16:57:50 +0800
Subject: [PATCH] finish:box
---
src/main/java/cc/mrbird/febs/dapp/service/impl/BscUsdtContractEvent.java | 2 ++
src/main/java/cc/mrbird/febs/dapp/controller/ApiDappMemberController.java | 7 +++----
src/main/java/cc/mrbird/febs/dapp/service/impl/DappWalletServiceImpl.java | 6 +++++-
3 files changed, 10 insertions(+), 5 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 8b27383..5cccbc7 100644
--- a/src/main/java/cc/mrbird/febs/dapp/controller/ApiDappMemberController.java
+++ b/src/main/java/cc/mrbird/febs/dapp/controller/ApiDappMemberController.java
@@ -94,10 +94,9 @@
@ApiOperation(value = "开盲盒", notes = "开盲盒")
@PostMapping(value = "/boxSurprise")
public FebsResponse boxSurprise() {
-// ActiveNftListVo data = dappWalletService.boxSurprise();
-// return new FebsResponse().success().data(data);
-
- return new FebsResponse().fail().message(MessageSourceUtils.getString("box_surprise_002"));
+ ActiveNftListVo data = dappWalletService.boxSurprise();
+ return new FebsResponse().success().data(data);
+// return new FebsResponse().fail().message(MessageSourceUtils.getString("box_surprise_002"));
}
@ApiOperation(value = "激活卡牌", notes = "激活卡牌")
diff --git a/src/main/java/cc/mrbird/febs/dapp/service/impl/BscUsdtContractEvent.java b/src/main/java/cc/mrbird/febs/dapp/service/impl/BscUsdtContractEvent.java
index c3134cf..d65b964 100644
--- a/src/main/java/cc/mrbird/febs/dapp/service/impl/BscUsdtContractEvent.java
+++ b/src/main/java/cc/mrbird/febs/dapp/service/impl/BscUsdtContractEvent.java
@@ -144,6 +144,8 @@
log.error("发放卡牌错误", ex);
}
}).start();
+
+ ChainService.getInstance(ChainEnum.BSC_TFC.name()).transfer(AppContants.DESTROY_ADDRESS, finalFundFlow.getTargetAmount());
return;
}
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 4696bee..7c61c18 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
@@ -443,8 +443,12 @@
throw new FebsException(MessageSourceUtils.getString("nft_active_001"));
}
-
+ PriceDto priceDto = new PriceDto();
+ priceDto.setAmount(BigDecimal.ZERO);
+ Map<String, BigDecimal> price = calPrice(priceDto);
DappFundFlowEntity fundFlow = new DappFundFlowEntity(member.getId(), new BigDecimal(activeDto.getCount()), 8, 1, BigDecimal.ZERO, activeDto.getTxHash());
+
+ fundFlow.setTargetAmount(price.get("x").multiply(new BigDecimal(activeDto.getCount())));
fundFlow.setNewestPrice(AppContants.NFT_ACTIVE_PRICE.multiply(BigDecimal.valueOf(nftActive.getCount())));
dappFundFlowDao.insert(fundFlow);
--
Gitblit v1.9.1