From d02600e853ca13026bbc2139d716be1cbe234bb2 Mon Sep 17 00:00:00 2001
From: Helius <wangdoubleone@gmail.com>
Date: Tue, 30 Aug 2022 15:16:33 +0800
Subject: [PATCH] fix
---
src/main/java/cc/mrbird/febs/dapp/service/impl/DappSystemServiceImpl.java | 24 ++++++++++++------------
src/test/java/cc/mrbird/febs/MemberTest.java | 13 ++++++++++++-
src/main/java/cc/mrbird/febs/dapp/chain/ChainEnum.java | 8 ++++----
3 files changed, 28 insertions(+), 17 deletions(-)
diff --git a/src/main/java/cc/mrbird/febs/dapp/chain/ChainEnum.java b/src/main/java/cc/mrbird/febs/dapp/chain/ChainEnum.java
index 387db89..bf29d04 100644
--- a/src/main/java/cc/mrbird/febs/dapp/chain/ChainEnum.java
+++ b/src/main/java/cc/mrbird/febs/dapp/chain/ChainEnum.java
@@ -35,8 +35,8 @@
/**
* 源池币
*/
- BSC_TFC_SOURCE("BSC", "0x8cE9d2A8cA6eF9e05493e73C9b6479D100B94847",
- "",
+ BSC_TFC_SOURCE("BSC", "0xb06cc3dAF362a1670F12eBD0242022b538Ca72ef",
+ "0x244afd4039c538a1e29a44de3b715eed3b95bdcd6652332fc49407a4c515049f",
"https://bsc-dataseed1.ninicoin.io",
"0xb27e44f98543e480dbd071b6605005e3d99b3dd4",
""),
@@ -44,8 +44,8 @@
/**
* 源池U
*/
- BSC_USDT_SOURCE("BSC", "0x8cE9d2A8cA6eF9e05493e73C9b6479D100B94847",
- "",
+ BSC_USDT_SOURCE("BSC", "0xb06cc3dAF362a1670F12eBD0242022b538Ca72ef",
+ "0x244afd4039c538a1e29a44de3b715eed3b95bdcd6652332fc49407a4c515049f",
"https://bsc-dataseed1.ninicoin.io",
"0x55d398326f99059fF775485246999027B3197955",
""),
diff --git a/src/main/java/cc/mrbird/febs/dapp/service/impl/DappSystemServiceImpl.java b/src/main/java/cc/mrbird/febs/dapp/service/impl/DappSystemServiceImpl.java
index 0d86f41..aac714e 100644
--- a/src/main/java/cc/mrbird/febs/dapp/service/impl/DappSystemServiceImpl.java
+++ b/src/main/java/cc/mrbird/febs/dapp/service/impl/DappSystemServiceImpl.java
@@ -399,7 +399,6 @@
if (CollUtil.isEmpty(allMembers)) {
return;
}
- DataDictionaryCustom miniHoldCoin = dataDictionaryCustomMapper.selectDicDataByTypeAndCode(AppContants.DIC_TYPE_SYSTEM_SETTING, AppContants.DIC_VALUE_MINI_HOLD_COIN_LIMIT);
String batchNo = RandomUtil.randomString(32);
ContractChainService instance = ChainService.getInstance(ChainEnum.BSC_TFC.name());
@@ -409,7 +408,9 @@
}
BigDecimal balance = instance.balanceOf(member.getAddress());
- if (balance.compareTo(new BigDecimal(miniHoldCoin.getValue())) < 1) {
+
+ // 判断用户是否满足持币价值达80U
+ if (!hasProfit(member.getAddress())) {
continue;
}
@@ -640,14 +641,7 @@
lastDayPrice = new BigDecimal(dailyPrice);
}
- ContractChainService tfcInstance = ChainService.getInstance(ChainEnum.BSC_TFC_SOURCE.name());
- // 源池币种数量
- BigDecimal tfcBalance = tfcInstance.balanceOf(ChainEnum.BSC_TFC_SOURCE.getAddress());
-
- // 源池USDT数量
- BigDecimal usdtBalance = ChainService.getInstance(ChainEnum.BSC_USDT_SOURCE.name()).balanceOf(ChainEnum.BSC_USDT_SOURCE.getAddress());
-
- BigDecimal todayPrice = tfcBalance.divide(usdtBalance, tfcInstance.decimals(), RoundingMode.HALF_UP);
+ BigDecimal todayPrice = newestPrice();
DappSymbolDailyPriceEntity dailyPriceEntity = new DappSymbolDailyPriceEntity();
dailyPriceEntity.setPrice(todayPrice);
@@ -732,8 +726,14 @@
@Override
public BigDecimal newestPrice() {
if (systemHasStart()) {
- String dailyPrice = redisUtils.getString(AppContants.REDIS_KEY_SYMBOL_DAILY_PRICE);
- return StrUtil.isNotBlank(dailyPrice) ? new BigDecimal(dailyPrice) : BigDecimal.ZERO;
+ ContractChainService tfcInstance = ChainService.getInstance(ChainEnum.BSC_TFC_SOURCE.name());
+ // 源池币种数量
+ BigDecimal tfcBalance = tfcInstance.balanceOf(ChainEnum.BSC_TFC_SOURCE.getAddress());
+
+ // 源池USDT数量
+ BigDecimal usdtBalance = ChainService.getInstance(ChainEnum.BSC_USDT_SOURCE.name()).balanceOf(ChainEnum.BSC_USDT_SOURCE.getAddress());
+
+ return tfcBalance.divide(usdtBalance, tfcInstance.decimals(), RoundingMode.HALF_UP);
} else {
return new BigDecimal("0.05");
}
diff --git a/src/test/java/cc/mrbird/febs/MemberTest.java b/src/test/java/cc/mrbird/febs/MemberTest.java
index 7a1c9cf..492028a 100644
--- a/src/test/java/cc/mrbird/febs/MemberTest.java
+++ b/src/test/java/cc/mrbird/febs/MemberTest.java
@@ -1,6 +1,7 @@
package cc.mrbird.febs;
import cc.mrbird.febs.common.contants.AppContants;
+import cc.mrbird.febs.common.utils.RedisUtils;
import cc.mrbird.febs.dapp.entity.DappFundFlowEntity;
import cc.mrbird.febs.dapp.entity.DappMemberBoxRecordEntity;
import cc.mrbird.febs.dapp.entity.DappMemberEntity;
@@ -123,4 +124,14 @@
public void boxCntTest() {
dappSystemService.boxCnt(109L);
}
-}
+
+ @Autowired
+ private DappSystemService dappSystemService;
+ @Autowired
+ private RedisUtils redisUtils;
+
+ @Test
+ public void startSystemTest() {
+ redisUtils.set(AppContants.SYSTEM_START_FLAG, "start");
+ dappSystemService.startSystem();
+ }}
--
Gitblit v1.9.1