From 1599c832fb3267afdd6672871c116c66b6106fc7 Mon Sep 17 00:00:00 2001
From: KKSU <15274802129@163.com>
Date: Mon, 22 Apr 2024 11:13:27 +0800
Subject: [PATCH] 滑点权重改成U计算
---
src/main/java/cc/mrbird/febs/dapp/service/impl/AdminBannerServiceImpl.java | 2 +-
src/main/java/cc/mrbird/febs/dapp/service/impl/DappWalletServiceImpl.java | 9 ++++++++-
src/main/resources/templates/febs/views/dapp/member-zhi-ya.html | 2 ++
src/main/java/cc/mrbird/febs/dapp/entity/DappAchieve.java | 3 +++
4 files changed, 14 insertions(+), 2 deletions(-)
diff --git a/src/main/java/cc/mrbird/febs/dapp/entity/DappAchieve.java b/src/main/java/cc/mrbird/febs/dapp/entity/DappAchieve.java
index f2cf477..b3ecc3f 100644
--- a/src/main/java/cc/mrbird/febs/dapp/entity/DappAchieve.java
+++ b/src/main/java/cc/mrbird/febs/dapp/entity/DappAchieve.java
@@ -35,4 +35,7 @@
@TableField(exist = false)
private String address;
+ @TableField(exist = false)
+ private BigDecimal usdtAmount;
+
}
diff --git a/src/main/java/cc/mrbird/febs/dapp/service/impl/AdminBannerServiceImpl.java b/src/main/java/cc/mrbird/febs/dapp/service/impl/AdminBannerServiceImpl.java
index 524171d..6c3c0a8 100644
--- a/src/main/java/cc/mrbird/febs/dapp/service/impl/AdminBannerServiceImpl.java
+++ b/src/main/java/cc/mrbird/febs/dapp/service/impl/AdminBannerServiceImpl.java
@@ -151,7 +151,7 @@
objectQueryWrapper.eq("state",1);
List<DappAchieve> dappAchieves = dappAchieveMapper.selectList(objectQueryWrapper);
if(CollUtil.isNotEmpty(dappAchieves)){
- BigDecimal teamAchieveMemberSum = dappAchieves.stream().map(DappAchieve::getAmount).reduce(BigDecimal.ZERO, BigDecimal::add);
+ BigDecimal teamAchieveMemberSum = dappAchieves.stream().map(item-> item.getAmount().multiply(item.getPrice())).reduce(BigDecimal.ZERO, BigDecimal::add).setScale(2,BigDecimal.ROUND_DOWN);
memberEntity.setZhiYaAmount(teamAchieveMemberSum);
}
}
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 28c7560..74263f4 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
@@ -354,7 +354,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
diff --git a/src/main/resources/templates/febs/views/dapp/member-zhi-ya.html b/src/main/resources/templates/febs/views/dapp/member-zhi-ya.html
index 01158f0..bd172c3 100644
--- a/src/main/resources/templates/febs/views/dapp/member-zhi-ya.html
+++ b/src/main/resources/templates/febs/views/dapp/member-zhi-ya.html
@@ -118,6 +118,8 @@
{field: 'address', title: '用户地址', minWidth: 400,align:'center',totalRowText:"合计"},
{templet: '#beState', title: '状态', minWidth: 180,align:'center'},
{field: 'amount', title: '质押数量', minWidth: 100,align:'center', totalRow:true},
+ {field: 'price', title: '质押价格', minWidth: 100,align:'center', totalRow:true},
+ {field: 'usdtAmount', title: 'USDT', minWidth: 100,align:'center', totalRow:true},
// {field: 'amountDone', title: '累计产出', minWidth: 100,align:'center'},
{field: 'amountMax', title: '出局数量', minWidth: 100,align:'center', totalRow:true},
{field: 'amountDay', title: '每日产出', minWidth: 100,align:'center', totalRow:true},
--
Gitblit v1.9.1