From 95324a4bf873ad138cc6315d59f7f2911ff78d18 Mon Sep 17 00:00:00 2001
From: Helius <wangdoubleone@gmail.com>
Date: Tue, 30 Aug 2022 21:15:46 +0800
Subject: [PATCH] fix
---
src/main/java/cc/mrbird/febs/dapp/service/impl/DappSystemServiceImpl.java | 136 ++++++++++++++++++++++++++++++++++----------
1 files changed, 104 insertions(+), 32 deletions(-)
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 44f099b..96812d3 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
@@ -61,6 +61,7 @@
private final DappSymbolDailyPriceMapper dappSymbolDailyPriceMapper;
private final DappMemberBoxRecordMapper dappMemberBoxRecordMapper;
private final DappWalletCoinDao dappWalletCoinDao;
+ private final DappSdeWithdrawFeeDao dappSdeWithdrawFeeDao;
@Override
@@ -320,7 +321,7 @@
OnlineTransferUtil.addTransfer(AppContants.DESTROY_ADDRESS, destroyAmount, fundFlow.getType(), 3, ChainEnum.BSC_TFC_SOURCE.name(), AppContants.SYMBOL_COIN, batchNo);
BigDecimal remain = fundFlow.getFee().subtract(destroyAmount);
- BigDecimal preNftAmount = remain.divide(new BigDecimal(5000),2 ,RoundingMode.HALF_UP);
+ BigDecimal preNftAmount = remain.divide(new BigDecimal(5000), 2, RoundingMode.HALF_UP);
BigDecimal total = BigDecimal.ZERO;
for (Map.Entry<String, Integer> entry : cardCntMap.entrySet()) {
@@ -332,7 +333,8 @@
OnlineTransferUtil.addTransfer(entry.getKey(), profit, 4, 1, ChainEnum.BSC_TFC_SOURCE.name(), AppContants.SYMBOL_COIN, batchNo);
total = total.add(profit);
- };
+ }
+ ;
if (remain.subtract(total).compareTo(BigDecimal.ZERO) > 0) {
OnlineTransferUtil.addTransfer(ChainEnum.BSC_TFC_FEE.getAddress(), remain.subtract(total), 4, 3, ChainEnum.BSC_TFC_SOURCE.name(), AppContants.SYMBOL_COIN, batchNo);
@@ -397,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());
@@ -407,7 +408,9 @@
}
BigDecimal balance = instance.balanceOf(member.getAddress());
- if (balance.compareTo(new BigDecimal(miniHoldCoin.getValue())) < 1) {
+
+ // 判断用户是否满足持币价值达80U
+ if (!hasProfit(member.getAddress())) {
continue;
}
@@ -532,19 +535,19 @@
public void startSystem() {
log.info("启动系统");
- Thread thread = new Thread(new Runnable() {
- @Override
- public void run() {
- transferPoolSetting();
- sourcePoolUsdtOutLimitSetting();
- }
- });
+// Thread thread = new Thread(new Runnable() {
+// @Override
+// public void run() {
+// }
+// });
- thread.start();
+ transferPoolSetting();
+ sourcePoolUsdtOutLimitSetting();
+// thread.start();
}
// 最低容量(百分比)
- private final BigDecimal volProp = new BigDecimal("2");
+ private final BigDecimal volProp = new BigDecimal("5");
// 每日增/减百分比
private final BigDecimal changeProp = new BigDecimal("1");
@@ -638,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);
@@ -721,7 +717,6 @@
public boolean systemHasStart() {
String hasStart = redisUtils.getString(AppContants.SYSTEM_START_FLAG);
if (!"start".equals(hasStart)) {
- log.info("系统未启动");
return false;
}
@@ -731,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");
}
@@ -758,15 +759,22 @@
* @param data
*/
@Override
+ @Transactional(rollbackFor = Exception.class)
public void sdmWithdrawFee(String data) {
- BigDecimal totalFee = new BigDecimal(data);
- String batchNo = RandomUtil.randomString(16);
+ JSONObject jsonObject = JSONObject.parseObject(data);
- BigDecimal cardProfit = totalFee.multiply(new BigDecimal("0.5"));
+ String address = jsonObject.getString("address");
+ if (!ChainEnum.BSC_TFC_FEE.getAddress().equals(address)) {
+ return;
+ }
+
+ String flowId = jsonObject.getString("flow");
+ BigDecimal totalFee = new BigDecimal(jsonObject.getString("fee"));
+
+ BigDecimal cardProfit = totalFee.multiply(new BigDecimal("0.4"));
BigDecimal destroy = totalFee.subtract(cardProfit);
BigDecimal preFee = cardProfit.divide(BigDecimal.valueOf(5000), ChainService.getInstance(ChainEnum.BSC_TFC.name()).decimals(), RoundingMode.HALF_UP);
-
Map<String, Integer> cardCntMap = nfcCardMap();
if (!cardCntMap.isEmpty()) {
for (Map.Entry<String, Integer> entry : cardCntMap.entrySet()) {
@@ -776,14 +784,78 @@
if (member == null) {
continue;
}
- DappFundFlowEntity fundFlow = new DappFundFlowEntity(member.getId(), amount, 4, 1, null, null);
- dappFundFlowDao.insert(fundFlow);
- OnlineTransferUtil.addTransfer(entry.getKey(), amount, 5, 1, ChainEnum.BSC_TFC_FEE.name(), AppContants.SYMBOL_COIN, batchNo);
+ DappSdeWithdrawFeeEntity sdeWithdrawFee = new DappSdeWithdrawFeeEntity(member.getId(), member.getAddress(), amount, Long.parseLong(flowId));
+ dappSdeWithdrawFeeDao.insert(sdeWithdrawFee);
}
}
- OnlineTransferUtil.addTransfer(AppContants.DESTROY_ADDRESS, destroy, 5, 2, ChainEnum.BSC_TFC_FEE.name(), AppContants.SYMBOL_COIN, batchNo);
+ DappSdeWithdrawFeeEntity destroyFee = new DappSdeWithdrawFeeEntity(null, AppContants.DESTROY_ADDRESS, destroy, Long.parseLong(flowId));
+ dappSdeWithdrawFeeDao.insert(destroyFee);
+ }
+// @Override
+// public void sdmWithdrawFee(String data) {
+// JSONObject jsonObject = JSONObject.parseObject(data);
+//
+// String address = jsonObject.getString("address");
+// if (!ChainEnum.BSC_TFC_FEE.getAddress().equals(address)) {
+// return;
+// }
+//
+// BigDecimal totalFee = new BigDecimal(jsonObject.getString("fee"));
+// String batchNo = RandomUtil.randomString(16);
+//
+// BigDecimal cardProfit = totalFee.multiply(new BigDecimal("0.4"));
+// BigDecimal destroy = totalFee.subtract(cardProfit);
+//
+// BigDecimal preFee = cardProfit.divide(BigDecimal.valueOf(5000), ChainService.getInstance(ChainEnum.BSC_TFC.name()).decimals(), RoundingMode.HALF_UP);
+//
+// Map<String, Integer> cardCntMap = nfcCardMap();
+// if (!cardCntMap.isEmpty()) {
+// for (Map.Entry<String, Integer> entry : cardCntMap.entrySet()) {
+// BigDecimal amount = preFee.multiply(new BigDecimal(entry.getValue()));
+//
+// DappMemberEntity member = dappMemberDao.selectByAddress(entry.getKey(), "BSC");
+// if (member == null) {
+// continue;
+// }
+// DappFundFlowEntity fundFlow = new DappFundFlowEntity(member.getId(), amount, 4, 2, null, null);
+// dappFundFlowDao.insert(fundFlow);
+//
+// OnlineTransferUtil.addTransfer(entry.getKey(), amount, 5, 1, ChainEnum.BSC_TFC_FEE.name(), AppContants.SYMBOL_COIN, batchNo);
+// }
+// }
+//
+// OnlineTransferUtil.addTransfer(AppContants.DESTROY_ADDRESS, destroy, 5, 2, ChainEnum.BSC_TFC_FEE.name(), AppContants.SYMBOL_COIN, batchNo);
+//
+// Map<String, Object> map = new HashMap<>();
+// map.put("batchNo", batchNo);
+// chainProducer.sendOnlineTransfer(JSONObject.toJSONString(map));
+// }
+
+ @Override
+ @Transactional(rollbackFor = Exception.class)
+ public void sdmWithdrawFeeDistrib() {
+ List<DappSdeWithdrawFeeEntity> list = dappSdeWithdrawFeeDao.selectShouldReturnList();
+ if (CollUtil.isEmpty(list)) {
+ return;
+ }
+
+ String batchNo = RandomUtil.randomString(16);
+ list.forEach(item -> {
+ if (!AppContants.DESTROY_ADDRESS.equals(item.getAddress())) {
+ DappMemberEntity member = dappMemberDao.selectByAddress(item.getAddress(), "BSC");
+ if (member == null) {
+ return;
+ }
+
+ DappFundFlowEntity fundFlow = new DappFundFlowEntity(member.getId(), item.getAmount(), 4, 2, null, null);
+ dappFundFlowDao.insert(fundFlow);
+ }
+
+ OnlineTransferUtil.addTransfer(item.getAddress(), item.getAmount(), 5, 1, ChainEnum.BSC_TFC_FEE.name(), AppContants.SYMBOL_COIN, batchNo);
+ });
+ dappSdeWithdrawFeeDao.updateHasReturnToFinish();
Map<String, Object> map = new HashMap<>();
map.put("batchNo", batchNo);
--
Gitblit v1.9.1