From 25b53e6a1cf900a61ae7fb63d943c72e0f7eeb3f Mon Sep 17 00:00:00 2001
From: xiaoyong931011 <15274802129@163.com>
Date: Tue, 10 Jan 2023 11:07:58 +0800
Subject: [PATCH] 20221227 充值归集
---
src/test/java/cc/mrbird/febs/ProfitTest.java | 149 ++++++++++++++++++++++++++++++++++++++++++++-----
1 files changed, 133 insertions(+), 16 deletions(-)
diff --git a/src/test/java/cc/mrbird/febs/ProfitTest.java b/src/test/java/cc/mrbird/febs/ProfitTest.java
index a988c2e..a702b5b 100644
--- a/src/test/java/cc/mrbird/febs/ProfitTest.java
+++ b/src/test/java/cc/mrbird/febs/ProfitTest.java
@@ -6,6 +6,13 @@
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.*;
import cc.mrbird.febs.mall.quartz.OrderSettlementJob;
@@ -26,10 +33,13 @@
import org.springframework.beans.factory.annotation.Autowired;
import org.springframework.boot.test.context.SpringBootTest;
+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
@@ -95,7 +105,7 @@
@Test
public void directorProfitTest() {
- Long directRewardId = 587L;
+ Long directRewardId = 628L;
MallOrderInfo orderInfo = mallOrderInfoMapper.selectById(directRewardId);
if(ObjectUtil.isEmpty(orderInfo)){
return;
@@ -118,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,
@@ -127,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");
/**
* 生成直推返利的流水记录
@@ -150,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(),
@@ -163,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(),
@@ -182,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());
@@ -204,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");
}
/**
* 团队管理补贴
@@ -253,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;
}
@@ -337,11 +356,63 @@
@Autowired
private IMallAchieveService mallAchieveService;
+ @Autowired
+ private MallMemberStarBuyMapper mallMemberStarBuyMapper;
+
@Test
public void achieveTest() {
- List<MallOrderItem> items = mallOrderItemMapper.selectList(null);
- for (MallOrderItem item : items) {
- mallAchieveService.add(item.getId());
+ List<MallMemberStarBuy> mallMemberStarBuys = mallMemberStarBuyMapper.selectByStatus(1);
+ if(CollUtil.isEmpty(mallMemberStarBuys)){
+ return;
+ }
+ for(MallMemberStarBuy mallMemberStarBuy : mallMemberStarBuys){
+ Long memberId = mallMemberStarBuy.getMemberId();
+ MallMember mallMember = memberMapper.selectById(memberId);
+ //用户不存在跳出本次循环
+ if(ObjectUtil.isEmpty(mallMember)){
+ continue;
+ }
+ //返还总金额
+ BigDecimal amount = mallMemberStarBuy.getAmount();
+ //剩余返还总金额不足，跳出本次循环
+ BigDecimal avaAmount = mallMemberStarBuy.getAvaAmount();
+ if(avaAmount.compareTo(BigDecimal.ZERO) <= 0){
+ continue;
+ }
+ //每次返还比例
+ DataDictionaryCustom returnPercentDic = dataDictionaryCustomMapper.selectDicDataByTypeAndCode(
+ DataDictionaryEnum.RETURN_PERCENT.getType(),
+ DataDictionaryEnum.RETURN_PERCENT.getCode()
+ );
+ String returnPercentStr = returnPercentDic.getValue();
+ BigDecimal returnPercent = new BigDecimal(returnPercentStr).multiply(new BigDecimal(0.01)).setScale(2,BigDecimal.ROUND_DOWN);
+ //本次返还金额
+ BigDecimal returnAmount = amount.multiply(returnPercent).setScale(2,BigDecimal.ROUND_DOWN);
+ /**
+ * 如果本次返还金额大于剩余返还总金额
+ */
+ if(returnAmount.compareTo(avaAmount) >= 0){
+ returnAmount = avaAmount;
+ avaAmount = BigDecimal.ZERO;
+ }else{
+ avaAmount = avaAmount.subtract(returnAmount).setScale(2,BigDecimal.ROUND_DOWN);
+ }
+ //增加用户金额
+ memberWalletService.addBalance(returnAmount,mallMember.getId());
+ //生成流水记录
+ Long subsidyAmountFlowId = mallMoneyFlowService.addMoneyFlow(
+ mallMember.getId(),
+ mallMemberStarBuy.getBuyCode(),
+ returnAmount,
+ MallMoneyFlowTypeEnum.RETURN_MARKET_STAR.getCode(),
+ MallMoneyFlow.STATUS_SUCCESS,
+ MallMoneyFlow.IS_RETURN_Y,
+ mallMember.getId(),
+ FlowTypeEnum.BALANCE.getValue(),
+ MallMoneyFlowTypeEnum.RETURN_MARKET_STAR.getName()
+ );
+ //更新记录
+ mallMemberStarBuyMapper.updateAvaAmountById(avaAmount,mallMemberStarBuy.getId());
}
}
//
@@ -358,10 +429,56 @@
// amount.put("amount", 2);
// }
//
-// @Test
-// public void scorePool(){
-// memberProfitService.scorePool();
-// }
+
+
+ @Autowired
+ private ContractEventService bscUsdtContractEvent;
+
+
+ @Autowired
+ private BaseCoinService baseCoinService;
+ @Autowired
+ private RedisUtils redisUtils;
+ @Resource
+ private UsdtErc20UpdateService usdtErc20UpdateService;
+ @Resource
+ private MemberCoinAddressDao memberCoinAddressDao;
+ @Test
+ public void scorePool(){
+
+ 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
// public void staticProfit(){
--
Gitblit v1.9.1