From 499a0c143b62381b780fb901e0b1a7d417fe8755 Mon Sep 17 00:00:00 2001
From: xiaoyong931011 <15274802129@163.com>
Date: Mon, 05 Dec 2022 15:56:56 +0800
Subject: [PATCH] 20221130
---
src/main/java/cc/mrbird/febs/dapp/service/impl/DappSystemServiceImpl.java | 66 +++++++++++++++++++++++---------
1 files changed, 47 insertions(+), 19 deletions(-)
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 bdc9ecd..924b777 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
@@ -340,7 +340,7 @@
QueryWrapper<DappMemberEntity> objectQueryWrapper = new QueryWrapper<>();
objectQueryWrapper.eq("referer_id",refererMember.getInviteId());
Integer selectCount = dappMemberDao.selectCount(objectQueryWrapper);
- if(i > selectCount){
+ if(i >= selectCount){
continue;
}
//获取对应层级奖励
@@ -383,7 +383,7 @@
String memberOutCount = redisUtils.getString(redisKey);
DataDictionaryCustom queueCountSet = dataDictionaryCustomMapper.selectDicDataByTypeAndCode(DataDictionaryEnum.QUEUE_COUNT.getType(), DataDictionaryEnum.QUEUE_COUNT.getCode());
String queueCount = queueCountSet.getValue();
- if(StrUtil.isBlank(memberOutCount)){
+ if(StrUtil.isBlank(memberOutCount) || !queueCount.equals(memberOutCount)){
redisUtils.set(redisKey,queueCount,0L);
memberOutCount = queueCount;
}
@@ -450,30 +450,34 @@
public void bnbTransfer(Long id) {
log.info("{}",id);
//获取对应的流水记录
- DappFundFlowEntity dappFundFlowEntity = dappFundFlowDao.selectById(id);
+ DappFundFlowEntity dappFundFlowEntity = dappFundFlowDao.selectInfoById(id);
if(ObjectUtil.isEmpty(dappFundFlowEntity)){
return;
}
if(DappFundFlowEntity.WITHDRAW_STATUS_AGREE == dappFundFlowEntity.getStatus()){
return;
}
-// //金额
-// BigDecimal amount = dappFundFlowEntity.getAmount();
-// Long memberId = dappFundFlowEntity.getMemberId();
-// DappMemberEntity dappMemberEntity = dappMemberDao.selectById(memberId);
-// if(ObjectUtil.isEmpty(dappMemberEntity)){
-// return;
+ Long memberId = dappFundFlowEntity.getMemberId();
+ DappMemberEntity dappMemberEntity = dappMemberDao.selectById(memberId);
+ if(ObjectUtil.isEmpty(dappMemberEntity)){
+ return;
+ }
+ Integer count = dappFundFlowDao.updateStatusById(DappFundFlowEntity.WITHDRAW_STATUS_AGREE,dappFundFlowEntity.getId());
+// if(count > 0){
+// DappFundFlowEntity dappFundFlow = dappFundFlowDao.selectById(id);
+// //金额
+// BigDecimal amount = dappFundFlow.getAmount();
+// //目标地址
+// String address = dappFundFlow.getAddress();
+// // String hash = ChainService.getInstance(ChainEnum.BSC_USDT.name()).transfer(address, amount);
+// String hash = ChainService.getInstance(ChainEnum.BNB.name()).transferBaseToken(address, amount);
+// if(StrUtil.isEmpty(hash)){
+// return;
+// }
+// log.info("{},{}",id,hash);
+// dappFundFlow.setFromHash(hash);
+// dappFundFlowDao.updateById(dappFundFlow);
// }
-// //目标地址
-// String address = dappMemberEntity.getAddress();
-// String hash = ChainService.getInstance(ChainEnum.BSC_USDT.name()).transfer(address, amount);
-// if(StrUtil.isEmpty(hash)){
-// return;
-// }
-// dappFundFlowEntity.setToHash(hash);
- dappFundFlowEntity.setStatus(DappFundFlowEntity.WITHDRAW_STATUS_AGREE);
- dappFundFlowDao.updateById(dappFundFlowEntity);
-
}
@Override
@@ -505,6 +509,30 @@
}
}
+ @Override
+ public void bnbTransferTest(Long id) {
+ DappFundFlowEntity dappFundFlow = dappFundFlowDao.selectById(id);
+ //用户已经加入动能队列
+ DappSystemProfit dappSystemProfit = dappSystemProfitDao.selectById(dappFundFlow.getSystemProfitId()==null ? 0L : dappFundFlow.getSystemProfitId());
+ if(ObjectUtil.isEmpty(dappSystemProfit)){
+ return;
+ }
+ if(ObjectUtil.isEmpty(dappFundFlow)){
+ return;
+ }
+ //金额
+ BigDecimal amount = dappFundFlow.getAmount();
+ //目标地址
+ String address = dappFundFlow.getAddress();
+ String hash = ChainService.getInstance(ChainEnum.BNB.name()).transferBaseToken(address, amount);
+ if(StrUtil.isEmpty(hash)){
+ return;
+ }
+ log.info("{},{}",id,hash);
+ dappFundFlow.setFromHash(hash);
+ dappFundFlowDao.updateById(dappFundFlow);
+ }
+
public static void main(String[] args) {
String refererIds = "1,2,3,4,5," +
"6,7,8,9,10," +
--
Gitblit v1.9.1