From be3f0d8e8616f37621b3e969d6ca269ddf58a3a2 Mon Sep 17 00:00:00 2001
From: xiaoyong931011 <15274802129@163.com>
Date: Fri, 02 Dec 2022 17:33:40 +0800
Subject: [PATCH] 20221130

---
 src/main/java/cc/mrbird/febs/dapp/service/impl/DappSystemServiceImpl.java |   21 +++++++++++----------
 1 files changed, 11 insertions(+), 10 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..8e9c1c0 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
@@ -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,20 +450,22 @@
     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;
         }
+        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){
 //        //金额
 //        BigDecimal amount = dappFundFlowEntity.getAmount();
-//        Long memberId = dappFundFlowEntity.getMemberId();
-//        DappMemberEntity dappMemberEntity = dappMemberDao.selectById(memberId);
-//        if(ObjectUtil.isEmpty(dappMemberEntity)){
-//            return;
-//        }
 //        //目标地址
 //        String address = dappMemberEntity.getAddress();
 //        String hash = ChainService.getInstance(ChainEnum.BSC_USDT.name()).transfer(address, amount);
@@ -471,9 +473,8 @@
 //            return;
 //        }
 //        dappFundFlowEntity.setToHash(hash);
-        dappFundFlowEntity.setStatus(DappFundFlowEntity.WITHDRAW_STATUS_AGREE);
-        dappFundFlowDao.updateById(dappFundFlowEntity);
-
+//        dappFundFlowDao.updateById(dappFundFlowEntity);
+//        }
     }
 
     @Override

--
Gitblit v1.9.1