From db8be7ac334e1297dcfc3111b926a598bf750002 Mon Sep 17 00:00:00 2001
From: Helius <wangdoubleone@gmail.com>
Date: Wed, 31 Aug 2022 15:10:24 +0800
Subject: [PATCH] fix
---
src/main/java/cc/mrbird/febs/dapp/service/impl/DappSystemServiceImpl.java | 164 ++++++++++++++++++--------------
/dev/null | 36 -------
src/main/resources/mapper/dapp/DappPriceRecordDao.xml | 5 +
src/main/java/cc/mrbird/febs/dapp/controller/ApiDappMemberController.java | 5 +
src/main/java/cc/mrbird/febs/dapp/entity/DappSdeWithdrawFeeEntity.java | 5
src/test/java/cc/mrbird/febs/MemberTest.java | 12 ++
src/main/java/cc/mrbird/febs/job/SystemTradeJob.java | 2
src/main/java/cc/mrbird/febs/dapp/mapper/DappPriceRecordDao.java | 7 +
src/test/java/cc/mrbird/febs/ChainTest.java | 2
src/main/java/cc/mrbird/febs/dapp/entity/DappPriceRecordEntity.java | 27 +++++
10 files changed, 153 insertions(+), 112 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 5cccbc7..36cf5fc 100644
--- a/src/main/java/cc/mrbird/febs/dapp/controller/ApiDappMemberController.java
+++ b/src/main/java/cc/mrbird/febs/dapp/controller/ApiDappMemberController.java
@@ -115,6 +115,11 @@
return new FebsResponse().success().data(dappWalletService.findUnActiveNftList());
}
+ @ApiOperation(value = "价格", notes = "价格")
+ @GetMapping(value = "/price")
+ public FebsResponse price() {
+ return new FebsResponse().success();
+ }
@PostMapping(value = "/logout")
public FebsResponse logout() {
diff --git a/src/main/java/cc/mrbird/febs/dapp/entity/DappPriceRecordEntity.java b/src/main/java/cc/mrbird/febs/dapp/entity/DappPriceRecordEntity.java
new file mode 100644
index 0000000..8fe8238
--- /dev/null
+++ b/src/main/java/cc/mrbird/febs/dapp/entity/DappPriceRecordEntity.java
@@ -0,0 +1,27 @@
+package cc.mrbird.febs.dapp.entity;
+
+import com.baomidou.mybatisplus.annotation.IdType;
+import com.baomidou.mybatisplus.annotation.TableId;
+import com.baomidou.mybatisplus.annotation.TableName;
+import lombok.Data;
+
+import java.math.BigDecimal;
+import java.util.Date;
+
+/**
+ * @author wzy
+ * @date 2022-08-31
+ **/
+@Data
+@TableName("dapp_price_record")
+public class DappPriceRecordEntity {
+
+ private Date createTime;
+
+ @TableId(type = IdType.AUTO)
+ private Long id;
+
+ private BigDecimal price;
+
+ private Long timestamp;
+}
diff --git a/src/main/java/cc/mrbird/febs/dapp/entity/DappSdeWithdrawFeeEntity.java b/src/main/java/cc/mrbird/febs/dapp/entity/DappSdeWithdrawFeeEntity.java
index fbbbed4..791e9a0 100644
--- a/src/main/java/cc/mrbird/febs/dapp/entity/DappSdeWithdrawFeeEntity.java
+++ b/src/main/java/cc/mrbird/febs/dapp/entity/DappSdeWithdrawFeeEntity.java
@@ -24,13 +24,16 @@
private Integer hasReturn;
+ private String outAddressName;
+
public DappSdeWithdrawFeeEntity() {}
- public DappSdeWithdrawFeeEntity(Long memberId, String address, BigDecimal amount, Long sdeFlowId) {
+ public DappSdeWithdrawFeeEntity(Long memberId, String address, BigDecimal amount, Long sdeFlowId, String outAddressName) {
this.memberId = memberId;
this.address = address;
this.amount = amount;
this.sdeFlowId = sdeFlowId;
this.hasReturn = 2;
+ this.outAddressName = outAddressName;
}
}
diff --git a/src/main/java/cc/mrbird/febs/dapp/mapper/DappPriceRecordDao.java b/src/main/java/cc/mrbird/febs/dapp/mapper/DappPriceRecordDao.java
new file mode 100644
index 0000000..18fc2ee
--- /dev/null
+++ b/src/main/java/cc/mrbird/febs/dapp/mapper/DappPriceRecordDao.java
@@ -0,0 +1,7 @@
+package cc.mrbird.febs.dapp.mapper;
+
+import cc.mrbird.febs.dapp.entity.DappPriceRecordEntity;
+import com.baomidou.mybatisplus.core.mapper.BaseMapper;
+
+public interface DappPriceRecordDao extends BaseMapper<DappPriceRecordEntity> {
+}
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 96812d3..f72adf3 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
@@ -292,6 +292,7 @@
Map<String, Integer> cardCntMap = nfcCardMap();
ContractChainService instance = ChainService.getInstance(ChainEnum.BSC_TFC.name());
+ int decimals = instance.decimals();
if (fundFlow.getType() == 1) {
BigDecimal totalBalance = BigDecimal.ZERO;
@@ -307,62 +308,62 @@
balanceMap.forEach((key, value) -> {
DappMemberEntity member = dappMemberDao.selectByAddress(key, "BSC");
- BigDecimal rate = value.divide(finalTotalBalance, 2, RoundingMode.HALF_UP);
+ BigDecimal rate = value.divide(finalTotalBalance, decimals, RoundingMode.HALF_UP);
BigDecimal memberProfit = fundFlow.getFee().multiply(rate);
- DappFundFlowEntity distribFlow = new DappFundFlowEntity(member.getId(), memberProfit, 4, 2, BigDecimal.ZERO);
- dappFundFlowDao.insert(distribFlow);
- OnlineTransferUtil.addTransfer(key, memberProfit, 4, 1, ChainEnum.BSC_TFC_SOURCE.name(), AppContants.SYMBOL_COIN, batchNo);
+ if (memberProfit.compareTo(BigDecimal.ZERO) == 0) {
+ return;
+ }
+
+ DappSdeWithdrawFeeEntity sdeWithdrawFee = new DappSdeWithdrawFeeEntity(member.getId(), member.getAddress(), memberProfit, fundFlow.getId(), ChainEnum.BSC_TFC_SOURCE.name());
+ dappSdeWithdrawFeeDao.insert(sdeWithdrawFee);
+// DappFundFlowEntity distribFlow = new DappFundFlowEntity(member.getId(), memberProfit, 4, 2, BigDecimal.ZERO);
+// dappFundFlowDao.insert(distribFlow);
+// OnlineTransferUtil.addTransfer(key, memberProfit, 4, 1, ChainEnum.BSC_TFC_SOURCE.name(), AppContants.SYMBOL_COIN, batchNo);
});
} else if (fundFlow.getType() == 2) {
BigDecimal destroyAmount = fundFlow.getFee().multiply(new BigDecimal("2").divide(new BigDecimal("7"), instance.decimals(), RoundingMode.HALF_UP));
// 销毁
- OnlineTransferUtil.addTransfer(AppContants.DESTROY_ADDRESS, destroyAmount, fundFlow.getType(), 3, ChainEnum.BSC_TFC_SOURCE.name(), AppContants.SYMBOL_COIN, batchNo);
+// OnlineTransferUtil.addTransfer(AppContants.DESTROY_ADDRESS, destroyAmount, fundFlow.getType(), 3, ChainEnum.BSC_TFC_SOURCE.name(), AppContants.SYMBOL_COIN, batchNo);
+ DappSdeWithdrawFeeEntity destroy = new DappSdeWithdrawFeeEntity(null, AppContants.DESTROY_ADDRESS, destroyAmount, fundFlow.getId(), ChainEnum.BSC_TFC_SOURCE.name());
+ dappSdeWithdrawFeeDao.insert(destroy);
BigDecimal remain = fundFlow.getFee().subtract(destroyAmount);
- BigDecimal preNftAmount = remain.divide(new BigDecimal(5000), 2, RoundingMode.HALF_UP);
+ BigDecimal preNftAmount = remain.divide(new BigDecimal(5000), decimals, RoundingMode.HALF_UP);
BigDecimal total = BigDecimal.ZERO;
for (Map.Entry<String, Integer> entry : cardCntMap.entrySet()) {
DappMemberEntity member = dappMemberDao.selectByAddress(entry.getKey(), "BSC");
BigDecimal profit = new BigDecimal(entry.getValue()).multiply(preNftAmount);
+ if (profit.compareTo(BigDecimal.ZERO) == 0) {
+ return;
+ }
- DappFundFlowEntity distribFlow = new DappFundFlowEntity(member.getId(), profit, 4, 2, BigDecimal.ZERO);
- dappFundFlowDao.insert(distribFlow);
- OnlineTransferUtil.addTransfer(entry.getKey(), profit, 4, 1, ChainEnum.BSC_TFC_SOURCE.name(), AppContants.SYMBOL_COIN, batchNo);
+// DappFundFlowEntity distribFlow = new DappFundFlowEntity(member.getId(), profit, 4, 2, BigDecimal.ZERO);
+// dappFundFlowDao.insert(distribFlow);
+// OnlineTransferUtil.addTransfer(entry.getKey(), profit, 4, 1, ChainEnum.BSC_TFC_SOURCE.name(), AppContants.SYMBOL_COIN, batchNo);
+
+ DappSdeWithdrawFeeEntity sdeWithdrawFee = new DappSdeWithdrawFeeEntity(member.getId(), member.getAddress(), profit, fundFlow.getId(), ChainEnum.BSC_TFC_SOURCE.name());
+ dappSdeWithdrawFeeDao.insert(sdeWithdrawFee);
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);
+ DappSdeWithdrawFeeEntity sdeWithdrawFee = new DappSdeWithdrawFeeEntity(null, ChainEnum.BSC_TFC_FEE.getAddress(), remain.subtract(total), fundFlow.getId(), ChainEnum.BSC_TFC_SOURCE.name());
+ dappSdeWithdrawFeeDao.insert(sdeWithdrawFee);
+// OnlineTransferUtil.addTransfer(ChainEnum.BSC_TFC_FEE.getAddress(), remain.subtract(total), 4, 3, ChainEnum.BSC_TFC_SOURCE.name(), AppContants.SYMBOL_COIN, batchNo);
}
- } else {
- return;
}
- Map<String, String> map = new HashMap<>();
- map.put("batchNo", batchNo);
-
- // 发送转账消息
- chainProducer.sendOnlineTransfer(JSONObject.toJSONString(map));
+// Map<String, String> map = new HashMap<>();
+// map.put("batchNo", batchNo);
+// // 发送转账消息
+// chainProducer.sendOnlineTransfer(JSONObject.toJSONString(map));
}
-
-// public static void main(String[] args) throws IOException {
-// Document parse = Jsoup.parse(new URL("https://bscscan.com/token/generic-tokenholders2?a=0x03c7d3f141c5f03971604958170e253362e13be6"), 10000000);
-//
-// Elements tbodys = parse.getElementsByTag("tbody");
-//
-// Element tbody = tbodys.get(0);
-//
-// Elements elements = tbody.getElementsMatchingOwnText("^0x.*$");
-//
-// String text = elements.get(0).text();
-// System.out.println(1111);
-// }
@Override
public void mining() {
@@ -499,35 +500,44 @@
}
DappFundFlowEntity fundFlow = dappFundFlowDao.selectById(id);
-
DappMemberEntity member = dappMemberDao.selectById(fundFlow.getMemberId());
- DappMemberEntity referer = dappMemberDao.selectMemberInfoByInviteId(member.getRefererId());
- if (referer == null || "admin".equals(referer.getAccountType())) {
- return;
+
+ int i = 1;
+ boolean flag = true;
+ while (flag) {
+ member = dappMemberDao.selectMemberInfoByInviteId(member.getRefererId());
+ if (member == null || "admin".equals(member.getAccountType())) {
+ return;
+ }
+
+ if (!hasProfit(member.getAddress())) {
+ return;
+ }
+
+ DataDictionaryCustom dic = dataDictionaryCustomMapper.selectDicDataByTypeAndCode(AppContants.DIC_TYPE_SYSTEM_SETTING, AppContants.DIC_VALUE_USER_BUY_REWARD);
+ BigDecimal prop = new BigDecimal(dic.getValue()).divide(new BigDecimal("100"), 2, RoundingMode.HALF_UP);
+ BigDecimal reward = fundFlow.getAmount().multiply(prop);
+
+ BigDecimal balance = ChainService.getInstance(ChainEnum.BSC_TFC_REWARD.name()).balanceOf(ChainEnum.BSC_TFC_REWARD.getAddress());
+ if (balance.compareTo(reward) < 1) {
+ return;
+ }
+
+ DappFundFlowEntity rewardFlow = new DappFundFlowEntity(member.getId(), reward, 4, 2, BigDecimal.ZERO);
+ dappFundFlowDao.insert(rewardFlow);
+
+ OnlineTransferUtil.addTransfer(member.getAddress(), reward, 4, 1, ChainEnum.BSC_TFC_REWARD.name(), AppContants.SYMBOL_COIN, rewardFlow.getId().toString());
+
+ Map<String, String> map = new HashMap<>();
+ map.put("batchNo", rewardFlow.getId().toString());
+ map.put("type", "flow");
+ chainProducer.sendOnlineTransfer(JSONObject.toJSONString(map));
+
+ i++;
+ if (i > 2) {
+ flag = false;
+ }
}
-
- if (!hasProfit(referer.getAddress())) {
- return;
- }
-
- DataDictionaryCustom dic = dataDictionaryCustomMapper.selectDicDataByTypeAndCode(AppContants.DIC_TYPE_SYSTEM_SETTING, AppContants.DIC_VALUE_USER_BUY_REWARD);
- BigDecimal prop = new BigDecimal(dic.getValue()).divide(new BigDecimal("100"), 2, RoundingMode.HALF_UP);
- BigDecimal reward = fundFlow.getAmount().multiply(prop);
-
- BigDecimal balance = ChainService.getInstance(ChainEnum.BSC_TFC_REWARD.name()).balanceOf(ChainEnum.BSC_TFC_REWARD.getAddress());
- if (balance.compareTo(reward) < 1) {
- return;
- }
-
- DappFundFlowEntity rewardFlow = new DappFundFlowEntity(referer.getId(), reward, 4, 2, BigDecimal.ZERO);
- dappFundFlowDao.insert(rewardFlow);
-
- OnlineTransferUtil.addTransfer(referer.getAddress(), reward, 4, 1, ChainEnum.BSC_TFC_REWARD.name(), AppContants.SYMBOL_COIN, rewardFlow.getId().toString());
-
- Map<String, String> map = new HashMap<>();
- map.put("batchNo", rewardFlow.getId().toString());
- map.put("type", "batch");
- chainProducer.sendOnlineTransfer(JSONObject.toJSONString(map));
}
@@ -785,12 +795,12 @@
continue;
}
- DappSdeWithdrawFeeEntity sdeWithdrawFee = new DappSdeWithdrawFeeEntity(member.getId(), member.getAddress(), amount, Long.parseLong(flowId));
+ DappSdeWithdrawFeeEntity sdeWithdrawFee = new DappSdeWithdrawFeeEntity(member.getId(), member.getAddress(), amount, Long.parseLong(flowId), ChainEnum.BSC_TFC_FEE.name());
dappSdeWithdrawFeeDao.insert(sdeWithdrawFee);
}
}
- DappSdeWithdrawFeeEntity destroyFee = new DappSdeWithdrawFeeEntity(null, AppContants.DESTROY_ADDRESS, destroy, Long.parseLong(flowId));
+ DappSdeWithdrawFeeEntity destroyFee = new DappSdeWithdrawFeeEntity(null, AppContants.DESTROY_ADDRESS, destroy, Long.parseLong(flowId), ChainEnum.BSC_TFC_FEE.name());
dappSdeWithdrawFeeDao.insert(destroyFee);
}
// @Override
@@ -843,7 +853,7 @@
String batchNo = RandomUtil.randomString(16);
list.forEach(item -> {
- if (!AppContants.DESTROY_ADDRESS.equals(item.getAddress())) {
+ if (item.getMemberId() != null) {
DappMemberEntity member = dappMemberDao.selectByAddress(item.getAddress(), "BSC");
if (member == null) {
return;
@@ -853,7 +863,7 @@
dappFundFlowDao.insert(fundFlow);
}
- OnlineTransferUtil.addTransfer(item.getAddress(), item.getAmount(), 5, 1, ChainEnum.BSC_TFC_FEE.name(), AppContants.SYMBOL_COIN, batchNo);
+ OnlineTransferUtil.addTransfer(item.getAddress(), item.getAmount(), 5, 1, item.getOutAddressName(), AppContants.SYMBOL_COIN, batchNo);
});
dappSdeWithdrawFeeDao.updateHasReturnToFinish();
@@ -881,21 +891,31 @@
return cardCntMap;
}
+ @Autowired
+ private DappPriceRecordDao dappPriceRecordDao;
+
@Override
public void tfcNewPrice() {
- BigDecimal newPrice;
- if (!systemHasStart()) {
- newPrice = new BigDecimal("0.05");
- } else {
- ContractChainService tfcInstance = ChainService.getInstance(ChainEnum.BSC_TFC.name());
- // u剩余数量
- BigDecimal sourceU = ChainService.getInstance(ChainEnum.BSC_USDT.name()).balanceOf(ChainEnum.BSC_USDT_SOURCE.getAddress());
- // 源池代币剩余数量
- BigDecimal sourceCoin = tfcInstance.balanceOf(ChainEnum.BSC_USDT_SOURCE.getAddress());
+ BigDecimal newPrice = newestPrice();
+// if (!systemHasStart()) {
+// newPrice = new BigDecimal("0.05");
+// } else {
+// ContractChainService tfcInstance = ChainService.getInstance(ChainEnum.BSC_TFC.name());
+// // u剩余数量
+// BigDecimal sourceU = ChainService.getInstance(ChainEnum.BSC_USDT.name()).balanceOf(ChainEnum.BSC_USDT_SOURCE.getAddress());
+// // 源池代币剩余数量
+// BigDecimal sourceCoin = tfcInstance.balanceOf(ChainEnum.BSC_USDT_SOURCE.getAddress());
+//
+// newPrice = sourceU.divide(sourceCoin, tfcInstance.decimals(), RoundingMode.HALF_UP);
+// }
- newPrice = sourceU.divide(sourceCoin, tfcInstance.decimals(), RoundingMode.HALF_UP);
- }
+ DappPriceRecordEntity dappPriceRecord = new DappPriceRecordEntity();
+ dappPriceRecord.setPrice(newPrice);
+ dappPriceRecord.setCreateTime(new Date());
+ dappPriceRecord.setTimestamp(System.currentTimeMillis());
+ dappPriceRecordDao.insert(dappPriceRecord);
+ // 给影子生态发送价格
chainProducer.sendTfcNewPrice(newPrice.toPlainString());
}
}
diff --git a/src/main/java/cc/mrbird/febs/job/NewPriceUpdateJob.java b/src/main/java/cc/mrbird/febs/job/NewPriceUpdateJob.java
deleted file mode 100644
index b2b5d33..0000000
--- a/src/main/java/cc/mrbird/febs/job/NewPriceUpdateJob.java
+++ /dev/null
@@ -1,36 +0,0 @@
-package cc.mrbird.febs.job;
-
-import cc.mrbird.febs.common.contants.AppContants;
-import cc.mrbird.febs.common.utils.RedisUtils;
-import com.huobi.client.SubscriptionClient;
-import com.huobi.client.SubscriptionOptions;
-import lombok.extern.slf4j.Slf4j;
-import org.springframework.beans.factory.annotation.Autowired;
-import org.springframework.stereotype.Component;
-
-import javax.annotation.PostConstruct;
-
-/**
- * @author
- * @date 2022-03-24
- **/
-@Slf4j
-@Component
-public class NewPriceUpdateJob{
-
- @Autowired
- private RedisUtils redisUtils;
-
- @PostConstruct
- public void initNewPriceUpdate() {
-// log.info("#最新价更新启动#");
-// redisUtils.set(AppContants.REDIS_KEY_CHANGE_FEE, 30);
-// SubscriptionOptions subscriptionOptions = new SubscriptionOptions();
-// subscriptionOptions.setConnectionDelayOnFailure(5);
-// subscriptionOptions.setUri("wss://api.hadax.com/ws");
-// SubscriptionClient subscriptionClient = SubscriptionClient.create("", "", subscriptionOptions);
-// subscriptionClient.subscribeTradeEvent("ethusdt", tradeEvent -> {
-// redisUtils.set(AppContants.REDIS_KEY_ETH_NEW_PRICE, tradeEvent.getTradeList().get(0).getPrice());
-// });
- }
-}
diff --git a/src/main/java/cc/mrbird/febs/job/SystemTradeJob.java b/src/main/java/cc/mrbird/febs/job/SystemTradeJob.java
index a2c2b90..f1976f3 100644
--- a/src/main/java/cc/mrbird/febs/job/SystemTradeJob.java
+++ b/src/main/java/cc/mrbird/febs/job/SystemTradeJob.java
@@ -69,7 +69,7 @@
systemService.mining();
}
- @Scheduled(cron = "0/10 * * * * ?")
+ @Scheduled(cron = "0/30 * * * * ?")
public void tfcNewPriceJob() {
systemService.tfcNewPrice();
}
diff --git a/src/main/resources/mapper/dapp/DappPriceRecordDao.xml b/src/main/resources/mapper/dapp/DappPriceRecordDao.xml
new file mode 100644
index 0000000..68b303a
--- /dev/null
+++ b/src/main/resources/mapper/dapp/DappPriceRecordDao.xml
@@ -0,0 +1,5 @@
+<?xml version="1.0" encoding="UTF-8"?>
+<!DOCTYPE mapper PUBLIC "-//mybatis.org//DTD Mapper 3.0//EN" "http://mybatis.org/dtd/mybatis-3-mapper.dtd">
+<mapper namespace="cc.mrbird.febs.dapp.mapper.DappPriceRecordDao">
+
+</mapper>
\ No newline at end of file
diff --git a/src/test/java/cc/mrbird/febs/ChainTest.java b/src/test/java/cc/mrbird/febs/ChainTest.java
index aed0c85..6d64045 100644
--- a/src/test/java/cc/mrbird/febs/ChainTest.java
+++ b/src/test/java/cc/mrbird/febs/ChainTest.java
@@ -158,7 +158,7 @@
@Test
public void sendCardTest() {
- ChainService.getInstance(ChainEnum.BSC_NFT_SDC.name()).safeMintNFT("0x7D5BAbb5D347Cf0e49D4510c69f545C687C5eB46");
+// ChainService.getInstance(ChainEnum.BSC_NFT_SDC.name()).safeMintNFT("0xbddfb8113ee3871774cb91cf1063cfba2a6becc8");
}
@Test
diff --git a/src/test/java/cc/mrbird/febs/MemberTest.java b/src/test/java/cc/mrbird/febs/MemberTest.java
index fe438f8..f27ea26 100644
--- a/src/test/java/cc/mrbird/febs/MemberTest.java
+++ b/src/test/java/cc/mrbird/febs/MemberTest.java
@@ -132,4 +132,14 @@
public void startSystemTest() {
redisUtils.set(AppContants.SYSTEM_START_FLAG, "start");
dappSystemService.startSystem();
- }}
+ }
+ @Test
+ public void tfcPriceTest() {
+ dappSystemService.tfcNewPrice();
+ }
+
+ @Test
+ public void buyRewardTest() {
+ dappSystemService.userBuyReward(347L);
+ }
+}
--
Gitblit v1.9.1