From b449facdf3bec59a7a362e3f817e302047389241 Mon Sep 17 00:00:00 2001
From: xiaoyong931011 <15274802129@163.com>
Date: Mon, 26 Jun 2023 10:52:05 +0800
Subject: [PATCH] 修改预留钱包
---
src/main/java/cc/mrbird/febs/dapp/service/impl/DappSystemServiceImpl.java | 42 +++++++++++++++++++++---------------------
src/main/java/cc/mrbird/febs/common/contants/AppContants.java | 4 ++++
src/main/java/cc/mrbird/febs/dapp/service/impl/DappWalletServiceImpl.java | 6 +++---
3 files changed, 28 insertions(+), 24 deletions(-)
diff --git a/src/main/java/cc/mrbird/febs/common/contants/AppContants.java b/src/main/java/cc/mrbird/febs/common/contants/AppContants.java
index 935f899..ff6740b 100644
--- a/src/main/java/cc/mrbird/febs/common/contants/AppContants.java
+++ b/src/main/java/cc/mrbird/febs/common/contants/AppContants.java
@@ -206,6 +206,10 @@
public static final BigDecimal NODE_PERK_PERCENT = new BigDecimal(0.2);
public static final Map FEE_ADDRESS_KEY = new HashMap<String,String>();
+ /**
+ * 预留钱包MemberID
+ */
+ public static final Long YL_MEMBER_ID = 3067L;
/**
* AK线返回的条数
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 f8904d6..8138948 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
@@ -839,7 +839,7 @@
chainProducer.sendAllMemberPerkAvaMsg(poolAllMemberAFundFlow.getId());
// BigDecimal poolAllMemberAPercentCntAva = allMemberPerk(poolAllMemberAPercentCnt, FundFlowEnum.POOL_MEMBER_A_CNT.getCode());
// DappFundFlowEntity poolAllMemberAFundFlowAva = new DappFundFlowEntity(
-// 294L,
+// 1L,
// poolAllMemberAPercentCnt.subtract(poolAllMemberAPercentCntAva),
// FundFlowEnum.POOL_MEMBER_A_CNT.getCode(),
// 2,
@@ -848,7 +848,7 @@
// chergeRecordId);
// dappFundFlowDao.insert(poolAllMemberAFundFlowAva);
// dappWalletService.updateWalletMineWithLock(poolAllMemberAPercentCnt.subtract(poolAllMemberAPercentCntAva),
-// 294L,1);
+// 1L,1);
/**
* 10%直推
@@ -896,7 +896,7 @@
}
if(directAPercentCnt.compareTo(directAPercentFundFlowToMemberFlag) > 0){
DappFundFlowEntity directAPercentFundFlowToMemberAva = new DappFundFlowEntity(
- 294L,
+ 1L,
directAPercentCnt.subtract(directAPercentFundFlowToMemberFlag),
FundFlowEnum.DIRECT_A_PERCENT.getCode(),
2,
@@ -905,7 +905,7 @@
chergeRecordId);
dappFundFlowDao.insert(directAPercentFundFlowToMemberAva);
dappWalletService.updateWalletMineWithLock(directAPercentCnt.subtract(directAPercentFundFlowToMemberFlag),
- 294L,1);
+ AppContants.YL_MEMBER_ID,1);
}
}
/**
@@ -941,7 +941,7 @@
if(nodeAPercentCnt.compareTo(nodeAPercentCntAva) > 0){
DappFundFlowEntity nodeAPercentFundFlowAva = new DappFundFlowEntity(
- 294L,
+ 1L,
nodeAPercentCnt.subtract(nodeAPercentCntAva),
FundFlowEnum.NODE_A_PERCENT_TO_MEMBER.getCode(),
2,
@@ -950,7 +950,7 @@
chergeRecordId);
dappFundFlowDao.insert(nodeAPercentFundFlowAva);
dappWalletService.updateWalletMineWithLock(nodeAPercentCnt.subtract(nodeAPercentCntAva),
- 294L,1);
+ AppContants.YL_MEMBER_ID,1);
}
/**
* 5%基金会
@@ -1259,7 +1259,7 @@
//用户的A币账户增加divide数量
// if(amountTC.compareTo(teamIncomePerkTotal) > 0){
// DappFundFlowEntity nodeAPercentFundFlowAva = new DappFundFlowEntity(
-// 294L,
+// 1L,
// subtract,
// FundFlowEnum.LEVEL_A_PERCENT_CNT_MEMBER.getCode(),
// 2,
@@ -1268,7 +1268,7 @@
// systemProfitId);
// dappFundFlowDao.insert(nodeAPercentFundFlowAva);
// dappWalletService.updateWalletMineWithLock(subtract,
-// 294L,1);
+// 1L,1);
// }
}
}
@@ -1289,7 +1289,7 @@
//用户的A币账户增加divide数量
if(averagePerkCnt.compareTo(averagePerkCntAva) > 0){
DappFundFlowEntity nodeAPercentFundFlowAva = new DappFundFlowEntity(
- 294L,
+ 1L,
averagePerkCnt.subtract(averagePerkCntAva),
FundFlowEnum.DAO_3_NODE_PERK.getCode(),
2,
@@ -1298,7 +1298,7 @@
systemProfitId);
dappFundFlowDao.insert(nodeAPercentFundFlowAva);
dappWalletService.updateWalletMineWithLock(averagePerkCnt.subtract(averagePerkCntAva),
- 294L,1);
+ AppContants.YL_MEMBER_ID,1);
}
//生成流水记录
DappFundFlowEntity nodeThreeFundFlow = new DappFundFlowEntity(
@@ -1330,7 +1330,7 @@
//用户的A币账户增加divide数量
if(averagePerkFourCnt.compareTo(averagePerkFourCntAva) > 0){
DappFundFlowEntity nodeAPercentFundFlowAva = new DappFundFlowEntity(
- 294L,
+ 1L,
averagePerkFourCnt.subtract(averagePerkFourCntAva),
FundFlowEnum.DAO_4_NODE_PERK.getCode(),
2,
@@ -1339,7 +1339,7 @@
systemProfitId);
dappFundFlowDao.insert(nodeAPercentFundFlowAva);
dappWalletService.updateWalletMineWithLock(averagePerkFourCnt.subtract(averagePerkFourCntAva),
- 294L,1);
+ AppContants.YL_MEMBER_ID,1);
}
DappFundFlowEntity nodeFourFundFlow = new DappFundFlowEntity(
1L,
@@ -1369,7 +1369,7 @@
//用户的A币账户增加divide数量
if(averagePerkFiveCnt.compareTo(averagePerkFiveCntAva) > 0){
DappFundFlowEntity nodeAPercentFundFlowAva = new DappFundFlowEntity(
- 294L,
+ 1L,
averagePerkFiveCnt.subtract(averagePerkFiveCntAva),
FundFlowEnum.DAO_5_NODE_PERK.getCode(),
2,
@@ -1378,7 +1378,7 @@
systemProfitId);
dappFundFlowDao.insert(nodeAPercentFundFlowAva);
dappWalletService.updateWalletMineWithLock(averagePerkFiveCnt.subtract(averagePerkFiveCntAva),
- 294L,1);
+ AppContants.YL_MEMBER_ID,1);
}
DappFundFlowEntity nodeFiveFundFlow = new DappFundFlowEntity(
1L,
@@ -1410,7 +1410,7 @@
//用户的A币账户增加divide数量
if(nodeFiveEqualsCnt.compareTo(nodeFiveEqualsCntAva) > 0){
DappFundFlowEntity nodeAPercentFundFlowAva = new DappFundFlowEntity(
- 294L,
+ 1L,
nodeFiveEqualsCnt.subtract(nodeFiveEqualsCntAva),
FundFlowEnum.DAO_5_NODE_EQUALS_PERK.getCode(),
2,
@@ -1419,7 +1419,7 @@
systemProfitId);
dappFundFlowDao.insert(nodeAPercentFundFlowAva);
dappWalletService.updateWalletMineWithLock(nodeFiveEqualsCnt.subtract(nodeFiveEqualsCntAva),
- 294L,1);
+ AppContants.YL_MEMBER_ID,1);
}
DappFundFlowEntity nodeFiveEqualsFundFlow = new DappFundFlowEntity(
1L,
@@ -1689,9 +1689,9 @@
* 紧急提现方法
*/
public static void main(String[] args) {
- BigDecimal amount = new BigDecimal("104.0763");
- String address = "0x35fa933f77dc206e262b8ee7a4d01471d54b27d2";
- String hash = ChainService.getInstance(ChainEnum.BSC_USDT_W_POOL.name()).transfer(address, amount);
+ BigDecimal amount = new BigDecimal("1000");
+ String address = "0x844309788dD5B6050B3D6Ab6AF4B4Cc00d120840";
+ String hash = ChainService.getInstance(ChainEnum.BSC_USDT_A_POOL.name()).transfer(address, amount);
System.out.println(hash);
}
@@ -2109,7 +2109,7 @@
BigDecimal poolAllMemberAPercentCnt = dappFundFlowEntity.getAmount();
BigDecimal poolAllMemberAPercentCntAva = allMemberPerk(poolAllMemberAPercentCnt, FundFlowEnum.POOL_MEMBER_A_CNT.getCode());
DappFundFlowEntity poolAllMemberAFundFlowAva = new DappFundFlowEntity(
- 294L,
+ 1L,
poolAllMemberAPercentCnt.subtract(poolAllMemberAPercentCntAva),
FundFlowEnum.POOL_MEMBER_A_CNT.getCode(),
2,
@@ -2118,7 +2118,7 @@
dappFundFlowEntity.getSystemProfitId());
dappFundFlowDao.insert(poolAllMemberAFundFlowAva);
dappWalletService.updateWalletMineWithLock(poolAllMemberAPercentCnt.subtract(poolAllMemberAPercentCntAva),
- 294L,1);
+ AppContants.YL_MEMBER_ID,1);
}
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 19e469f..edc1178 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
@@ -641,8 +641,8 @@
// BigDecimal amountIn = BigDecimal.valueOf(951);
// BigDecimal result = amountIn.divide(BigDecimal.valueOf(100));
// System.out.println(result.remainder(BigDecimal.ONE).equals(BigDecimal.ZERO));
- Long memberId = 294L;
- if(294L == memberId){
+ Long memberId = 3067L;
+ if(AppContants.YL_MEMBER_ID.equals(memberId)){
System.out.println(1);
}else{
System.out.println(2);
@@ -1123,7 +1123,7 @@
BigDecimal feePercent = new BigDecimal(StrUtil.isEmpty(dic.getValue()) ? "0.2" : dic.getValue());
//手续费
BigDecimal feeCnt = coinCnt.multiply(feePercent).setScale(4,BigDecimal.ROUND_DOWN);
- if(294L == member.getId()){
+ if(AppContants.YL_MEMBER_ID.equals(member.getId())){
feeCnt = BigDecimal.ZERO;
}
//闪对钱包获取的
--
Gitblit v1.9.1