From 63e846810263e5abf50ed9f9a313c3de928a5739 Mon Sep 17 00:00:00 2001
From: xiaoyong931011 <15274802129@163.com>
Date: Fri, 02 Jun 2023 22:59:36 +0800
Subject: [PATCH] twoCoin项目修改
---
src/main/java/cc/mrbird/febs/dapp/enumerate/FundFlowEnum.java | 2 ++
src/main/java/cc/mrbird/febs/dapp/service/impl/DappSystemServiceImpl.java | 43 ++++++++++++++++++++++++++++++++++---------
src/main/resources/mapper/dapp/DappFundFlowDao.xml | 2 +-
src/main/java/cc/mrbird/febs/dapp/chain/ChainEnum.java | 9 +++++++--
4 files changed, 44 insertions(+), 12 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 ac39bba..54f27ee 100644
--- a/src/main/java/cc/mrbird/febs/dapp/chain/ChainEnum.java
+++ b/src/main/java/cc/mrbird/febs/dapp/chain/ChainEnum.java
@@ -12,8 +12,13 @@
/**
* 提现USDT
*/
- BSC_USDT_W_POOL("BSC", "0xBa4BCd0e752A0dda78ecD0AA94Fae0E8713d027F",
- "0x270a863ec3161ac15bb7825b480a39a8d8eae91bdba97cb21061f46ca75586ae",
+// BSC_USDT_W_POOL("BSC", "0xBa4BCd0e752A0dda78ecD0AA94Fae0E8713d027F",
+// "0x270a863ec3161ac15bb7825b480a39a8d8eae91bdba97cb21061f46ca75586ae",
+// "https://bsc-dataseed1.ninicoin.io",
+// "0x55d398326f99059fF775485246999027B3197955",
+// ""),
+ BSC_USDT_W_POOL("BSC", "0x74fC0e035f315F7BD8b7686e22581AB1afC45e97",
+ "0xc9fd78a879b17007f353595354e3128df702fe5e3518762c0c517cd7e00d13a0",
"https://bsc-dataseed1.ninicoin.io",
"0x55d398326f99059fF775485246999027B3197955",
""),
diff --git a/src/main/java/cc/mrbird/febs/dapp/enumerate/FundFlowEnum.java b/src/main/java/cc/mrbird/febs/dapp/enumerate/FundFlowEnum.java
index f2c241c..13fbb44 100644
--- a/src/main/java/cc/mrbird/febs/dapp/enumerate/FundFlowEnum.java
+++ b/src/main/java/cc/mrbird/febs/dapp/enumerate/FundFlowEnum.java
@@ -8,6 +8,8 @@
*/
@Getter
public enum FundFlowEnum {
+ //进入提现池-(USDT 提现池)
+ USDT_IN_W_POOL("USDT_IN_W_POOL", 34),
//权益额度
MEMBER_AMOUNT_PERK_TOTAL("MEMBER_AMOUNT_PERK_TOTAL", 33),
//ANDAO互转
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 4584654..c67cfdb 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
@@ -677,10 +677,10 @@
PoolEnum.USDT_A_PERCENT.getType(),
PoolEnum.USDT_A_PERCENT.getCode()
);
- BigDecimal usdtAPercent = new BigDecimal(StrUtil.isEmpty(usdtAPercentDic.getValue()) ? "0.9" : usdtAPercentDic.getValue());
+ BigDecimal usdtAPercent = new BigDecimal(StrUtil.isEmpty(usdtAPercentDic.getValue()) ? "0.7" : usdtAPercentDic.getValue());
BigDecimal usdtAAmount = amount.multiply(usdtAPercent).setScale(4, BigDecimal.ROUND_DOWN);
- //生成一条进行中的90%进入A币底池的资金流水记录
+ //生成一条进行中的70%进入A币底池的资金流水记录
DappFundFlowEntity fundFlowToA = new DappFundFlowEntity(
1L,
usdtAAmount,
@@ -692,6 +692,18 @@
dappFundFlowDao.insert(fundFlowToA);
//90%进入A币底池
chainProducer.sendAntACoinInAPoolMsg(fundFlowToA.getId());
+
+ BigDecimal usdtWAmount = amount.multiply(new BigDecimal(0.2)).setScale(4, BigDecimal.ROUND_DOWN);
+ //生成一条进行中的20%进入A币底池的资金流水记录
+ DappFundFlowEntity fundFlowToW = new DappFundFlowEntity(
+ 1L,
+ usdtWAmount,
+ FundFlowEnum.USDT_IN_W_POOL.getCode(),
+ 1,
+ BigDecimal.ZERO,
+ null,
+ chergeRecordId);
+ dappFundFlowDao.insert(fundFlowToW);
DataDictionaryCustom usdtBPercentDic = dataDictionaryCustomMapper.selectDicDataByTypeAndCode(
PoolEnum.USDT_B_PERCENT.getType(),
@@ -1056,6 +1068,13 @@
BigDecimal amount = dappFundFlowEntity.getAmount();
//目标地址
String address = AppContants.ADDRESS_A_POOL_PEOJECT;
+ if(5 == dappFundFlowEntity.getType()){
+ address = AppContants.ADDRESS_A_POOL_PEOJECT;
+ }else if(34 == dappFundFlowEntity.getType() ){
+ address = ChainEnum.BSC_USDT_W_POOL.getAddress();
+ }else{
+ return;
+ }
/**
* 发起USDT转账
*/
@@ -1069,13 +1088,13 @@
dappFundFlowDao.updateById(dappFundFlowEntity);
}
- public static void main(String[] args) {
- String address = AppContants.ADDRESS_A_POOL_PEOJECT;
- /**
- * 发起USDT转账
- */
- String hash = ChainService.getInstance(ChainEnum.BSC_USDT_A_POOL.name()).transfer(address, new BigDecimal("0.01"));
- }
+// public static void main(String[] args) {
+// String address = AppContants.ADDRESS_A_POOL_PEOJECT;
+// /**
+// * 发起USDT转账
+// */
+// String hash = ChainService.getInstance(ChainEnum.BSC_USDT_A_POOL.name()).transfer(address, new BigDecimal("0.01"));
+// }
@Override
public void AntACoinBPollInMsg(Long id) {
@@ -2023,6 +2042,8 @@
address = AppContants.ADDRESS_A_POOL_PEOJECT;
}else if(6 == dappFundFlowEntity.getType()){
address = AppContants.ADDRESS_B_POOL_PEOJECT;
+ }else if(34 == dappFundFlowEntity.getType()){
+ address = ChainEnum.BSC_USDT_W_POOL.getAddress();
}else{
return;
}
@@ -2040,6 +2061,10 @@
}
+ public static void main(String[] args) {
+ System.out.println(ChainEnum.BSC_USDT_W_POOL.getAddress());
+ }
+
/**
* 生成当前分钟的k线数据，type为0
*/
diff --git a/src/main/resources/mapper/dapp/DappFundFlowDao.xml b/src/main/resources/mapper/dapp/DappFundFlowDao.xml
index 446d906..7c51ed7 100644
--- a/src/main/resources/mapper/dapp/DappFundFlowDao.xml
+++ b/src/main/resources/mapper/dapp/DappFundFlowDao.xml
@@ -139,7 +139,7 @@
where status = #{status}
and from_hash is null
and is_return = 2
- and type in (5,6)
+ and type in (5,6,34)
ORDER BY
id ASC
LIMIT 1
--
Gitblit v1.9.1