From 8ce06347909eaa44482b86a7ec1652aa16d793e1 Mon Sep 17 00:00:00 2001
From: KKSU <15274802129@163.com>
Date: Tue, 07 May 2024 10:26:46 +0800
Subject: [PATCH] 测试
---
src/main/java/cc/mrbird/febs/dapp/service/impl/DappWalletServiceImpl.java | 20 +++++++++++++++-----
1 files changed, 15 insertions(+), 5 deletions(-)
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 7764194..6477d88 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
@@ -87,10 +87,9 @@
BigDecimal ccToday = BigDecimal.ZERO;
if(CollUtil.isNotEmpty(ccTodays)){
for(DappMemberFund dappMemberFund : ccTodays){
- BigDecimal sameCoin = dappMemberFund.getSameCoin();
- BigDecimal finxMineCoin = dappMemberFund.getFinxMineCoin();
- BigDecimal price = dappMemberFund.getPrice();
- BigDecimal add = sameCoin.divide(price, 8, BigDecimal.ROUND_DOWN).add(finxMineCoin);
+ BigDecimal usdtCoin = dappMemberFund.getUsdtCoin();
+ BigDecimal coinTarget = dappMemberFund.getCoinTarget();
+ BigDecimal add = coinTarget.add(usdtCoin);
ccToday = ccToday.add(add);
}
}
@@ -374,10 +373,21 @@
dappAchieve.setAmountMax(achieveOut.multiply(amount).setScale(2,BigDecimal.ROUND_DOWN));
dappAchieve.setState(DappAchieve.STATUS_ING);
dappAchieve.setAmountDone(BigDecimal.ZERO);
+
+ /**
+ * 计算金本位和币本位
+ * 金本位：数量*价格*70*产矿百分比
+ * 币本位：数量*30*产矿百分比
+ */
+ BigDecimal price = dappAchieve.getPrice();
+ BigDecimal goldAmount = amount.multiply(price).multiply(new BigDecimal("0.7")).multiply(achieveOut).setScale(8, BigDecimal.ROUND_DOWN);
+ BigDecimal coinAmount = amount.multiply(new BigDecimal("0.3")).multiply(achieveOut).setScale(8, BigDecimal.ROUND_DOWN);
+ dappAchieve.setGoldAmount(goldAmount);
+ dappAchieve.setCoinAmount(coinAmount);
dappAchieveMapper.insert(dappAchieve);
asyncCjService.insertTeamPerk(flow.getId(), dappAchieve.getId());
- asyncCjService.calculateAchieve(dappAchieve);
+// asyncCjService.calculateAchieve(dappAchieve);
//发送一个延时队列消息。24小时之后产生第一次的质押产出
// chainProducer.sendZhiYaDelayMsg(dappAchieve.getId(), 24 * 60 * 60 * 1000L);
--
Gitblit v1.9.1