From ce17711c8a3216cd53b34bd01a4904a00f08c6f4 Mon Sep 17 00:00:00 2001
From: Helius <wangdoubleone@gmail.com>
Date: Wed, 23 Mar 2022 16:45:04 +0800
Subject: [PATCH] fix approve

---
 src/main/java/cc/mrbird/febs/dapp/service/impl/DappWalletServiceImpl.java |   53 ++++++++++++++++++++++++++++++++++++++++++++++++++---
 1 files changed, 50 insertions(+), 3 deletions(-)

diff --git a/src/main/java/cc/mrbird/febs/dapp/service/impl/DappWalletServiceImpl.java b/src/main/java/cc/mrbird/febs/dapp/service/impl/DappWalletServiceImpl.java
index 4e7c1e1..e4f7b59 100644
--- a/src/main/java/cc/mrbird/febs/dapp/service/impl/DappWalletServiceImpl.java
+++ b/src/main/java/cc/mrbird/febs/dapp/service/impl/DappWalletServiceImpl.java
@@ -1,6 +1,7 @@
 package cc.mrbird.febs.dapp.service.impl;
 
 import cc.mrbird.febs.common.contants.AppContants;
+import cc.mrbird.febs.common.entity.QueryRequest;
 import cc.mrbird.febs.common.exception.FebsException;
 import cc.mrbird.febs.common.utils.LoginUserUtil;
 import cc.mrbird.febs.dapp.dto.RecordInPageDto;
@@ -9,10 +10,12 @@
 import cc.mrbird.febs.dapp.mapper.*;
 import cc.mrbird.febs.dapp.service.DappWalletService;
 import cc.mrbird.febs.dapp.vo.WalletInfoVo;
+import com.baomidou.mybatisplus.core.metadata.IPage;
 import com.baomidou.mybatisplus.extension.plugins.pagination.Page;
 import lombok.RequiredArgsConstructor;
 import lombok.extern.slf4j.Slf4j;
 import org.springframework.stereotype.Service;
+import org.springframework.transaction.annotation.Transactional;
 
 import java.math.BigDecimal;
 import java.util.List;
@@ -47,6 +50,7 @@
     }
 
     @Override
+    @Transactional(rollbackFor = Exception.class)
     public void change(WalletOperateDto walletOperateDto) {
         DappMemberEntity member = LoginUserUtil.getAppUser();
 
@@ -84,6 +88,7 @@
     }
 
     @Override
+    @Transactional(rollbackFor = Exception.class)
     public void withdraw(WalletOperateDto walletOperateDto) {
         DappMemberEntity member = LoginUserUtil.getAppUser();
 
@@ -101,7 +106,7 @@
         DappFundFlowEntity fund = new DappFundFlowEntity(member.getId(), walletOperateDto.getAmount().negate(), AppContants.MONEY_TYPE_WITHDRAWAL, 1);
         dappFundFlowDao.insert(fund);
 
-        DappAccountMoneyChangeEntity usdtChange = new DappAccountMoneyChangeEntity(member.getId(), preAmount, walletOperateDto.getAmount(), walletCoin.getTotalAmount(), "USDT申请提现", AppContants.MONEY_TYPE_WITHDRAWAL);
+        DappAccountMoneyChangeEntity usdtChange = new DappAccountMoneyChangeEntity(member.getId(), preAmount, walletOperateDto.getAmount(), walletCoin.getAvailableAmount(), "USDT申请提现", AppContants.MONEY_TYPE_WITHDRAWAL);
         dappAccountMoneyChangeDao.insert(usdtChange);
     }
 
@@ -111,7 +116,49 @@
 
         DappFundFlowEntity dappFundFlowEntity = new DappFundFlowEntity();
         dappFundFlowEntity.setType(recordInPageDto.getType());
-        dappFundFlowDao.selectInPage(page, dappFundFlowEntity);
-        return null;
+        IPage<DappFundFlowEntity> records = dappFundFlowDao.selectInPage(page, dappFundFlowEntity);
+        return records.getRecords();
+    }
+
+    @Override
+    public IPage<DappFundFlowEntity> fundFlowInPage(DappFundFlowEntity dappFundFlowEntity, QueryRequest request) {
+        Page<DappFundFlowEntity> page = new Page<>(request.getPageNum(), request.getPageSize());
+        return dappFundFlowDao.selectInPage(page, dappFundFlowEntity);
+    }
+
+    @Override
+    public void withdrawAgreeOrNot(Long id, int type) {
+        DappFundFlowEntity fundFlow = dappFundFlowDao.selectById(id);
+        if (fundFlow == null) {
+            throw new FebsException("数据不存在");
+        }
+
+        if (type == 1) {
+            fundFlow.setStatus(DappFundFlowEntity.WITHDRAW_STATUS_AGREE);
+        } else if (type == 2) {
+            fundFlow.setStatus(DappFundFlowEntity.WITHDRAW_STATUS_DISAGREE);
+        } else {
+            throw new FebsException("参数错误");
+        }
+
+        dappFundFlowDao.updateById(fundFlow);
+    }
+
+    @Override
+    public IPage<DappWalletCoinEntity> walletCoinInPage(DappWalletCoinEntity walletCoin, QueryRequest request) {
+        Page<DappWalletCoinEntity> page = new Page<>(request.getPageNum(), request.getPageSize());
+        return dappWalletCoinDao.selectInPage(walletCoin, page);
+    }
+
+    @Override
+    public IPage<DappWalletMineEntity> walletMineInPage(DappWalletMineEntity walletMine, QueryRequest request) {
+        Page<DappWalletMineEntity> page = new Page<>(request.getPageNum(), request.getPageSize());
+        return dappWalletMineDao.selectInPage(walletMine, page);
+    }
+
+    @Override
+    public IPage<DappAccountMoneyChangeEntity> accountMoneyChangeInPage(DappAccountMoneyChangeEntity change, QueryRequest request) {
+        Page<DappAccountMoneyChangeEntity> page = new Page<>(request.getPageNum(), request.getPageSize());
+        return dappAccountMoneyChangeDao.selectInPage(change, page);
     }
 }

--
Gitblit v1.9.1