From 42d09905871d80e940330b3ad5c1d0bafac8dcb8 Mon Sep 17 00:00:00 2001
From: KKSU <15274802129@163.com>
Date: Sun, 28 Apr 2024 23:48:08 +0800
Subject: [PATCH] 测试环境新版
---
src/main/java/cc/mrbird/febs/dapp/service/impl/DappWalletServiceImpl.java | 47 +++++++++++++++++++++++++++++++++++++----------
1 files changed, 37 insertions(+), 10 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 56049fd..6a7ee19 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
@@ -80,10 +80,10 @@
BigDecimal zyToday = dappFundFlowDao.selectAmountTotalByTypeAndMemberIdAndDate(member.getId(), FlowTypeEnum.ZHI_YA.getValue(), new Date()).negate();
walletInfo.setZyToday(zyToday);
- BigDecimal ccTotal = dappFundFlowDao.selectAmountTotalByTypeAndMemberIdAndDate(member.getId(), FlowTypeEnum.ZHIYA_CHA_CHU.getValue(),null).negate();
+ BigDecimal ccTotal = dappFundFlowDao.selectAmountTotalByTypeAndMemberIdAndDate(member.getId(), FlowTypeEnum.ZHIYA_CHA_CHU.getValue(),null);
walletInfo.setCcTotal(ccTotal);
- BigDecimal ccToday = dappFundFlowDao.selectAmountTotalByTypeAndMemberIdAndDate(member.getId(), FlowTypeEnum.ZHIYA_CHA_CHU.getValue(), new Date()).negate();
+ BigDecimal ccToday = dappFundFlowDao.selectAmountTotalByTypeAndMemberIdAndDate(member.getId(), FlowTypeEnum.ZHIYA_CHA_CHU.getValue(), new Date());
walletInfo.setCcToday(ccToday);
BigDecimal gfaDays = new BigDecimal(redisUtils.getString(DataDicEnum.GFA_DAYS.getValue())).setScale(2,BigDecimal.ROUND_DOWN);
@@ -166,6 +166,9 @@
DappFundFlowEntity dappFundFlowEntity = new DappFundFlowEntity();
if (recordInPageDto.getType() != null && recordInPageDto.getType() != 0) {
dappFundFlowEntity.setStatus(recordInPageDto.getType());
+ }
+ if (recordInPageDto.getState() != null && recordInPageDto.getState() != 0) {
+ dappFundFlowEntity.setType(recordInPageDto.getState());
}
dappFundFlowEntity.setMemberId(member.getId());
IPage<DappFundFlowEntity> records = dappFundFlowDao.selectInPages(page, dappFundFlowEntity);
@@ -281,9 +284,9 @@
// if (BigDecimal.ZERO.compareTo(gfaDays) >= 0) {
// throw new FebsException("今日暂停质押");
// }
-// if (transferDto.getAmount().compareTo(gfaDays) > 0) {
-// throw new FebsException("今日最多质押"+gfaDays);
-// }
+ if (transferDto.getAmount().compareTo(zhiyaAmount) > 0) {
+ throw new FebsException("今日最多质押"+zhiyaAmount);
+ }
} else {
throw new FebsException("暂停质押");
}
@@ -323,6 +326,7 @@
//新增一条用户质押记录
DappAchieve dappAchieve = new DappAchieve();
dappAchieve.setMemberId(memberId);
+ dappAchieve.setPrice(transferDto.getPrice());
dappAchieve.setAmount(amount);
BigDecimal achieveReleasePercent = new BigDecimal("0.01").multiply(
new BigDecimal(redisUtils.getString(DataDicEnum.GFA_ACHIEVE_RELEASE.getValue())).setScale(2,BigDecimal.ROUND_DOWN)
@@ -353,7 +357,14 @@
@Override
public IPage<DappAchieve> dappAchieveInPage(DappAchieve dappAchieve, QueryRequest request) {
Page<DappAchieve> page = new Page<>(request.getPageNum(), request.getPageSize());
- return dappAchieveMapper.selectInPage(page, dappAchieve);
+ IPage<DappAchieve> dappAchieveIPage = dappAchieveMapper.selectInPage(page, dappAchieve);
+ List<DappAchieve> records = dappAchieveIPage.getRecords();
+ if(CollUtil.isNotEmpty(records)){
+ for(DappAchieve dappAchieve1 : records){
+ dappAchieve1.setUsdtAmount(dappAchieve1.getAmount().multiply(dappAchieve1.getPrice()).setScale(2,BigDecimal.ROUND_DOWN));
+ }
+ }
+ return dappAchieveIPage;
}
@Override
@@ -381,8 +392,11 @@
}
flowType = FlowTypeEnum.DAI_BI_OUT.getValue();
flowDes = FlowTypeEnum.DAI_BI_OUT.getDescrition();
+
+ dappMemberEntity.setBalance(balance.subtract(amount).setScale(2,BigDecimal.ROUND_DOWN));
+ dappMemberDao.updateBalanceWithVersion(dappMemberEntity);
}else{
- if(new BigDecimal("100").compareTo(amount) > 0){
+ if(new BigDecimal("1").compareTo(amount) > 0){
throw new FebsException("最小数量为100");
}
if(usdtBalance.compareTo(amount) < 0){
@@ -390,6 +404,9 @@
}
flowType = FlowTypeEnum.USDT_OUT.getValue();
flowDes = FlowTypeEnum.USDT_OUT.getDescrition();
+
+ dappMemberEntity.setUsdtBalance(usdtBalance.subtract(amount).setScale(2,BigDecimal.ROUND_DOWN));
+ dappMemberDao.updateUsdtBalanceWithVersion(dappMemberEntity);
}
DappFundFlowEntity fundFlowTuiJian = new DappFundFlowEntity(
@@ -402,10 +419,20 @@
dappMemberEntity.getAddress());
dappFundFlowDao.insert(fundFlowTuiJian);
- dappMemberEntity.setBalance(balance.subtract(amount).setScale(2,BigDecimal.ROUND_DOWN));
- dappMemberEntity.setUsdtBalance(usdtBalance.subtract(amount).setScale(2,BigDecimal.ROUND_DOWN));
- dappMemberDao.updateBalanceAndUsdtBalanceWithVersion(dappMemberEntity);
+// dappMemberEntity.setBalance(balance.subtract(amount).setScale(2,BigDecimal.ROUND_DOWN));
+// dappMemberEntity.setUsdtBalance(usdtBalance.subtract(amount).setScale(2,BigDecimal.ROUND_DOWN));
+// dappMemberDao.updateBalanceAndUsdtBalanceWithVersion(dappMemberEntity);
return new FebsResponse().success();
}
+
+ @Override
+ public List<DappMemberFund> memberFundList(RecordInPageDto recordInPageDto) {
+ DappMemberEntity member = LoginUserUtil.getAppUser();
+ Page<DappMemberFund> page = new Page<>(recordInPageDto.getPageNum(), recordInPageDto.getPageSize());
+ DappMemberFund dappMemberFund = new DappMemberFund();
+ dappMemberFund.setMemberId(member.getId());
+ IPage<DappMemberFund> records = dappFundFlowDao.memberFundList(page, dappMemberFund);
+ return records.getRecords();
+ }
}
--
Gitblit v1.9.1