From 81b15e722dce6ff4cdf2dc4fba4f211f4dbfadbb Mon Sep 17 00:00:00 2001
From: xiaoyong931011 <15274802129@163.com>
Date: Tue, 10 Jan 2023 11:42:34 +0800
Subject: [PATCH] 20221227 充值归集
---
src/test/java/cc/mrbird/febs/ProfitTest.java | 78 ++++++++++++++++++++++++++++++++++-----
1 files changed, 68 insertions(+), 10 deletions(-)
diff --git a/src/test/java/cc/mrbird/febs/ProfitTest.java b/src/test/java/cc/mrbird/febs/ProfitTest.java
index b770871..a702b5b 100644
--- a/src/test/java/cc/mrbird/febs/ProfitTest.java
+++ b/src/test/java/cc/mrbird/febs/ProfitTest.java
@@ -6,6 +6,12 @@
import cc.mrbird.febs.common.utils.AppContants;
import cc.mrbird.febs.common.utils.LoginUserUtil;
import cc.mrbird.febs.common.utils.MallUtils;
+import cc.mrbird.febs.common.utils.RedisUtils;
+import cc.mrbird.febs.mall.chain.enums.ChainEnum;
+import cc.mrbird.febs.mall.chain.enums.EthService;
+import cc.mrbird.febs.mall.chain.service.BaseCoinService;
+import cc.mrbird.febs.mall.chain.service.ChainService;
+import cc.mrbird.febs.mall.chain.service.ContractEventService;
import cc.mrbird.febs.mall.chain.service.UsdtErc20UpdateService;
import cc.mrbird.febs.mall.entity.*;
import cc.mrbird.febs.mall.mapper.*;
@@ -29,9 +35,11 @@
import javax.annotation.Resource;
import java.math.BigDecimal;
+import java.math.BigInteger;
import java.text.DecimalFormat;
import java.text.SimpleDateFormat;
import java.util.*;
+import java.util.concurrent.ExecutionException;
/**
* @author wzy
@@ -97,7 +105,7 @@
@Test
public void directorProfitTest() {
- Long directRewardId = 587L;
+ Long directRewardId = 628L;
MallOrderInfo orderInfo = mallOrderInfoMapper.selectById(directRewardId);
if(ObjectUtil.isEmpty(orderInfo)){
return;
@@ -120,7 +128,7 @@
Long subsidyAmountFlowId = mallMoneyFlowService.addMoneyFlow(
mallMember.getId(),
orderInfo.getOrderNo(),
- subsidyAmount.setScale(2, BigDecimal.ROUND_DOWN),
+ subsidyAmount.setScale(4, BigDecimal.ROUND_DOWN),
MallMoneyFlowTypeEnum.MARKET_SUBSIDIES.getCode(),
MallMoneyFlow.STATUS_SUCCESS,
MallMoneyFlow.IS_RETURN_Y,
@@ -129,7 +137,8 @@
MallMoneyFlowTypeEnum.MARKET_SUBSIDIES.getName()
);
- memberWalletService.addBalance(subsidyAmount.setScale(2, BigDecimal.ROUND_DOWN),mallMember.getId());
+// memberWalletService.addBalance(subsidyAmount.setScale(4, BigDecimal.ROUND_DOWN),mallMember.getId());
+ memberWalletService.add(subsidyAmount.setScale(4, BigDecimal.ROUND_DOWN), mallMember.getId(), "balance");
/**
* 生成直推返利的流水记录
@@ -152,7 +161,7 @@
DataDictionaryEnum.REWARD_PERCENT.getCode()
);
BigDecimal rewardPercent = new BigDecimal(rewardPercentDic.getValue()).multiply(new BigDecimal(0.01)).setScale(2,BigDecimal.ROUND_DOWN);
- BigDecimal directRewardAmount = subsidyAmount.multiply(rewardPercent).setScale(2, BigDecimal.ROUND_DOWN);
+ BigDecimal directRewardAmount = subsidyAmount.multiply(rewardPercent).setScale(4, BigDecimal.ROUND_DOWN);
Long marketSubsidyFlowId = mallMoneyFlowService.addMoneyFlow(
mallMember.getId(),
@@ -165,14 +174,18 @@
FlowTypeEnum.BALANCE.getValue(),
MallMoneyFlowTypeEnum.DIRECT_REWARD.getName()
);
- memberWalletService.addBalance(directRewardAmount,mallMemberOne.getId());
+
+// memberWalletService.addBalance(directRewardAmount,mallMemberOne.getId());
+
+ memberWalletService.add(directRewardAmount, mallMemberOne.getId(), "balance");
+
DataDictionaryCustom shareOneDic = dataDictionaryCustomMapper.selectDicDataByTypeAndCode(
DataDictionaryEnum.LEVEL_ONE.getType(),
DataDictionaryEnum.LEVEL_ONE.getCode()
);
//生成分享奖励的流水记录
BigDecimal shareOne = new BigDecimal(shareOneDic.getValue()).multiply(new BigDecimal(0.01)).setScale(2,BigDecimal.ROUND_DOWN);
- BigDecimal shareOneAmount = subsidyAmount.multiply(shareOne).setScale(2, BigDecimal.ROUND_DOWN);
+ BigDecimal shareOneAmount = subsidyAmount.multiply(shareOne).setScale(4, BigDecimal.ROUND_DOWN);
Long ShareOneFlowId = mallMoneyFlowService.addMoneyFlow(
mallMember.getId(),
orderInfo.getOrderNo(),
@@ -184,7 +197,8 @@
FlowTypeEnum.BALANCE.getValue(),
MallMoneyFlowTypeEnum.SHARE_REWARD_ONE.getName()
);
- memberWalletService.addBalance(shareOneAmount,mallMemberOne.getId());
+// memberWalletService.addBalance(shareOneAmount,mallMemberOne.getId());
+ memberWalletService.add(shareOneAmount, mallMemberOne.getId(), "balance");
}
//下单人的直推上级的直推
MallMember mallMemberTwo = memberMapper.selectInfoByInviteId(mallMemberOne.getReferrerId());
@@ -206,7 +220,8 @@
FlowTypeEnum.BALANCE.getValue(),
MallMoneyFlowTypeEnum.SHARE_REWARD_TWO.getName()
);
- memberWalletService.addBalance(shareTwoAmount,mallMemberTwo.getId());
+// memberWalletService.addBalance(shareTwoAmount,mallMemberTwo.getId());
+ memberWalletService.add(shareTwoAmount, mallMemberTwo.getId(), "balance");
}
/**
* 团队管理补贴
@@ -255,7 +270,9 @@
MallMoneyFlowTypeEnum.TEAM_REWARD.getName()
);
- memberWalletService.addBalance(teamManageAmount,mallMemberUp.getId());
+// memberWalletService.addBalance(teamManageAmount,mallMemberUp.getId());
+
+ memberWalletService.add(teamManageAmount, mallMemberUp.getId(), "balance");
}
levelStart = levelUp;
}
@@ -414,12 +431,53 @@
//
+ @Autowired
+ private ContractEventService bscUsdtContractEvent;
+
+ @Autowired
+ private BaseCoinService baseCoinService;
+ @Autowired
+ private RedisUtils redisUtils;
@Resource
private UsdtErc20UpdateService usdtErc20UpdateService;
+ @Resource
+ private MemberCoinAddressDao memberCoinAddressDao;
@Test
public void scorePool(){
- usdtErc20UpdateService.updateUsdt();
+
+ String next = "0xc1be17a02127e5cc1e6b2298436e8b467531f798";
+ MemberCoinAddressEntity memberCoinAddressEntity = memberCoinAddressDao.selectCoinAddressByAddressAndSymbolTag(next, "USDT", "ERC20");
+ if(ObjectUtil.isEmpty(memberCoinAddressEntity)){
+ return;
+ }
+ BigDecimal balanceOf = ChainService.getInstance(ChainEnum.BSC_USDT.name()).balanceOf(next);
+ if (balanceOf == null || balanceOf.compareTo(new BigDecimal("0.05")) < 1) {
+ return;
+ }
+ //查询手续费
+ BigDecimal balanceOfBaseToken = ChainService.getInstance(ChainEnum.BSC_USDT.name()).balanceOfBaseToken(next);
+
+ String gas = "5";
+ if(balanceOfBaseToken.compareTo(new BigDecimal(gas)) < 0){
+ //转手续费
+ ChainService.getInstance(ChainEnum.BSC_USDT.name()).transferBaseToken(next, new BigDecimal(gas));
+ }
+ ChainService.getInstance(ChainEnum.BSC_USDT.name()).transfer(memberCoinAddressEntity.getPrivateKey(),
+ memberCoinAddressEntity.getAddress(),
+ AppContants.ERC20_POOL_ADDRESS,
+ balanceOf.toString());
+// long start = System.currentTimeMillis();
+// Object incrementObj = redisUtils.get(AppContants.REDIS_KEY_BLOCK_ETH_INCREMENT_NUM);
+// BigInteger newest = ChainService.getInstance(ChainEnum.BSC_USDT.name()).blockNumber();
+// BigInteger block;
+// if (incrementObj == null) {
+// block = newest;
+// } else {
+// block = (BigInteger) incrementObj;
+// }
+//// ChainService.wssBaseCoinEventListener(BigInteger.valueOf(24317595), baseCoinService);
+// ChainService.wssContractEventListener(BigInteger.valueOf(24317595), bscUsdtContractEvent, ChainEnum.BSC_USDT.name());
}
//
// @Test
--
Gitblit v1.9.1