From 43061815fcd4e100fdef15d3b277acc883668877 Mon Sep 17 00:00:00 2001
From: KKSU <15274802129@163.com>
Date: Wed, 15 May 2024 17:36:20 +0800
Subject: [PATCH] 错误流水恢复
---
src/main/java/cc/mrbird/febs/job/GiveMeMoneyJob.java | 70 +++++++++++++++++++++++++----------
1 files changed, 50 insertions(+), 20 deletions(-)
diff --git a/src/main/java/cc/mrbird/febs/job/GiveMeMoneyJob.java b/src/main/java/cc/mrbird/febs/job/GiveMeMoneyJob.java
index 38c68a5..520292e 100644
--- a/src/main/java/cc/mrbird/febs/job/GiveMeMoneyJob.java
+++ b/src/main/java/cc/mrbird/febs/job/GiveMeMoneyJob.java
@@ -1,31 +1,28 @@
package cc.mrbird.febs.job;
-import cc.mrbird.febs.common.contants.AppContants;
import cc.mrbird.febs.common.enumerates.DataDicEnum;
import cc.mrbird.febs.common.utils.RedisUtils;
import cc.mrbird.febs.dapp.chain.ChainEnum;
import cc.mrbird.febs.dapp.chain.ChainService;
-import cc.mrbird.febs.dapp.entity.DappAddressList;
+import cc.mrbird.febs.dapp.entity.DappAchieve;
import cc.mrbird.febs.dapp.entity.DappHdRecord;
-import cc.mrbird.febs.dapp.mapper.DappAdressListDao;
+import cc.mrbird.febs.dapp.mapper.DappAchieveMapper;
import cc.mrbird.febs.dapp.mapper.DappHdRecordMapper;
-import cc.mrbird.febs.dapp.mapper.DappMemberDao;
import cc.mrbird.febs.dapp.service.DappSystemService;
-import cc.mrbird.febs.rabbit.producer.ChainProducer;
import cn.hutool.core.collection.CollUtil;
+import cn.hutool.core.date.DateTime;
+import cn.hutool.core.date.DateUtil;
import cn.hutool.core.util.ObjectUtil;
import cn.hutool.core.util.StrUtil;
+import com.baomidou.mybatisplus.core.conditions.query.QueryWrapper;
import lombok.extern.slf4j.Slf4j;
import org.springframework.beans.factory.annotation.Autowired;
import org.springframework.boot.autoconfigure.condition.ConditionalOnProperty;
import org.springframework.scheduling.annotation.Scheduled;
import org.springframework.stereotype.Component;
-import org.tron.trident.core.ApiWrapper;
-import org.tron.trident.core.contract.Contract;
-import org.tron.trident.core.contract.Trc20Contract;
import java.math.BigDecimal;
-import java.math.BigInteger;
+import java.util.Date;
import java.util.List;
/**
@@ -43,6 +40,37 @@
private RedisUtils redisUtils;
@Autowired
private DappHdRecordMapper dappHdRecordMapper;
+ @Autowired
+ private DappAchieveMapper dappAchieveMapper;
+ /**
+ * 计算业绩是否失效
+ */
+
+ @Scheduled(cron = "0 0 1 * * ? ")
+ public void achieveJob() {
+ QueryWrapper<DappAchieve> objectQueryWrapper = new QueryWrapper<>();
+ objectQueryWrapper.eq("state",DappAchieve.STATUS_ING);
+ List<DappAchieve> dappAchieves = dappAchieveMapper.selectList(objectQueryWrapper);
+ if(CollUtil.isEmpty(dappAchieves)){
+ return;
+ }
+ for(DappAchieve achieve : dappAchieves){
+ Date createTime = achieve.getCreateTime();
+ DateTime dateTime = DateUtil.offsetDay(createTime, 75);//失效时间
+ if(DateUtil.compare(new Date(),dateTime) > 0){
+ achieve.setState(DappAchieve.STATUS_DONE);
+ dappAchieveMapper.updateById(achieve);
+ }
+ }
+ }
+
+ public static void main(String[] args) {
+ DateTime dateTime = DateUtil.offsetDay(new Date(), 75);
+ System.out.println(dateTime);
+ System.out.println(DateUtil.compare(new Date(),dateTime));
+ System.out.println(DateUtil.compare(new Date(),dateTime) > 0);
+
+ }
/**
* 每日定时零点计算滑点
*/
@@ -55,6 +83,14 @@
//获取滑点钱包的余额
BigDecimal coinCnt = ChainService.getInstance(ChainEnum.BSC_GFA.name()).balanceOf("0x1Ea392645f816BF15f1Fc87728eA010585bAAE7D").setScale(8,BigDecimal.ROUND_DOWN);
BigDecimal coinPrice = ChainService.getInstance(ChainEnum.BSC_GFA.name()).getPrice("0x1Ea392645f816BF15f1Fc87728eA010585bAAE7D").setScale(8,BigDecimal.ROUND_DOWN);
+
+ if(new BigDecimal("10").compareTo(coinCnt) >= 0){
+ return;
+ }
+
+// BigDecimal coinCnt = ChainService.getInstance(ChainEnum.BSC_GFA.name()).balanceOf("0xF6b06A30196aA5E318232a3b61319eab0FD4A3bF").setScale(8,BigDecimal.ROUND_DOWN);
+// BigDecimal coinPrice = ChainService.getInstance(ChainEnum.BSC_GFA.name()).getPrice("0xF6b06A30196aA5E318232a3b61319eab0FD4A3bF").setScale(8,BigDecimal.ROUND_DOWN);
+
//获取上一时刻的数据
BigDecimal coinAmountOld =BigDecimal.ZERO;
DappHdRecord dappHdRecord = dappHdRecordMapper.selectNewRecord();
@@ -69,7 +105,11 @@
}
//这个时间段的新增余额
//此刻的余额-上一次账户的余额 = 这个时间段的新增余额
- BigDecimal subtract = coinCnt.subtract(coinAmountOld);
+ BigDecimal subtract = coinCnt.subtract(coinCnt).setScale(0,BigDecimal.ROUND_DOWN);
+
+ if(BigDecimal.ZERO.compareTo(subtract) >= 0){
+ return;
+ }
//获取这个时刻的滑点入账数量
BigDecimal multiply = coinPrice.multiply(subtract).multiply(new BigDecimal("0.97")).setScale(8,BigDecimal.ROUND_DOWN);
//更新这个时间段的滑点数量
@@ -82,17 +122,7 @@
dappHdRecordAdd.setCoinEvery(subtract);
dappHdRecordAdd.setCoinAmount(coinCnt);
dappHdRecordMapper.insert(dappHdRecordAdd);
-
- if(BigDecimal.ZERO.compareTo(subtract) >= 0){
- return;
- }
dappSystemService.tradeProfitDistribute(1L);
- }
-
- public static void main(String[] args) {
-// System.out.println(ChainService.getInstance(ChainEnum.BSC_GFA.name()).totalSupply());
-// System.out.println(ChainService.getInstance(ChainEnum.BSC_GFA.name()).balanceOf("0x1Ea392645f816BF15f1Fc87728eA010585bAAE7D"));
- System.out.println(ChainService.getInstance(ChainEnum.BSC_GFA.name()).getPrice("0x1Ea392645f816BF15f1Fc87728eA010585bAAE7D"));
}
}
--
Gitblit v1.9.1