From ee1667b3e8faa9c7f3cbc921ea7bb87c2e3f4358 Mon Sep 17 00:00:00 2001
From: KKSU <15274802129@163.com>
Date: Sun, 07 Apr 2024 17:53:26 +0800
Subject: [PATCH] 每人每日质押设置
---
src/main/java/cc/mrbird/febs/dapp/service/impl/AsyncCjServiceImpl.java | 33 ++++++++++++++++++++++++---------
src/main/java/cc/mrbird/febs/common/enumerates/FlowTypeEnum.java | 1 +
src/main/resources/templates/febs/views/modules/banner/coinSet.html | 6 ++++--
3 files changed, 29 insertions(+), 11 deletions(-)
diff --git a/src/main/java/cc/mrbird/febs/common/enumerates/FlowTypeEnum.java b/src/main/java/cc/mrbird/febs/common/enumerates/FlowTypeEnum.java
index 32f5710..5402f91 100644
--- a/src/main/java/cc/mrbird/febs/common/enumerates/FlowTypeEnum.java
+++ b/src/main/java/cc/mrbird/febs/common/enumerates/FlowTypeEnum.java
@@ -4,6 +4,7 @@
@Getter
public enum FlowTypeEnum {
+ TUAN_DUI_FAIL_DES(10,"总业绩{}，奖励失效"),
HUA_DIAN_TUANDUI_USDT(9,"总业绩{}，滑点奖励USDT"),
DAI_BI_OUT(8,"GFA提现"),
USDT_OUT(7,"USDT提现"),
diff --git a/src/main/java/cc/mrbird/febs/dapp/service/impl/AsyncCjServiceImpl.java b/src/main/java/cc/mrbird/febs/dapp/service/impl/AsyncCjServiceImpl.java
index 3734f1e..1c47c8b 100644
--- a/src/main/java/cc/mrbird/febs/dapp/service/impl/AsyncCjServiceImpl.java
+++ b/src/main/java/cc/mrbird/febs/dapp/service/impl/AsyncCjServiceImpl.java
@@ -310,17 +310,17 @@
//可以获取奖励的用户
Map<Long, BigDecimal> memberPerkMap = new HashMap<>();
//总团队业绩
-// BigDecimal memberPerkTotal = BigDecimal.ZERO;
- BigDecimal memberPerkTotal = dappAchieves.stream().map(DappAchieve::getAmount).reduce(BigDecimal.ZERO, BigDecimal::add);
- if(BigDecimal.ZERO.compareTo(memberPerkTotal) >= 0){
- return;
- }
+ BigDecimal memberPerkTotal = BigDecimal.ZERO;
+// BigDecimal memberPerkTotal = dappAchieves.stream().map(DappAchieve::getAmount).reduce(BigDecimal.ZERO, BigDecimal::add);
+// if(BigDecimal.ZERO.compareTo(memberPerkTotal) >= 0){
+// return;
+// }
//获取全部会员
Set<Long> allMembers = dappMemberEntities.stream().map(DappMemberEntity::getId).collect(Collectors.toSet());
//获取正在质押的会员ID
- Set<Long> achieveMembers = dappAchieves.stream().map(DappAchieve::getMemberId).collect(Collectors.toSet());
- Collection<Long> intersection = CollUtil.intersection(allMembers, achieveMembers);
- for(Long memberId : intersection){
+// Set<Long> achieveMembers = dappAchieves.stream().map(DappAchieve::getMemberId).collect(Collectors.toSet());
+// Collection<Long> intersection = CollUtil.intersection(allMembers, achieveMembers);
+ for(Long memberId : allMembers){
/**
* 获取每一个成员的四级直推
*/
@@ -356,7 +356,7 @@
if(BigDecimal.ZERO.compareTo(teamAchieveMemberSum) >= 0){
continue;
}
-// memberPerkTotal = memberPerkTotal.add(teamAchieveMemberSum);
+ memberPerkTotal = memberPerkTotal.add(teamAchieveMemberSum);
memberPerkMap.put(memberId,teamAchieveMemberSum);
}
@@ -374,6 +374,21 @@
if(ObjectUtil.isEmpty(dappMemberEntityExit)){
continue;
}
+ //如果没有进行中的质押，直接返回
+ QueryWrapper<DappAchieve> objectQueryWrappereq = new QueryWrapper<>();
+ objectQueryWrappereq.eq("state",DappAchieve.STATUS_ING);
+ objectQueryWrappereq.eq("member_id",memberId);
+ List<DappAchieve> dappAchieveseq = dappAchieveMapper.selectList(objectQueryWrappereq);
+ if(CollUtil.isEmpty(dappAchieveseq)){
+ DappFundFlowEntity fundFlowTuiJian = new DappFundFlowEntity(
+ memberId,
+ multiplyUsdt,
+ FlowTypeEnum.TUAN_DUI_FAIL.getValue(),
+ DappFundFlowEntity.WITHDRAW_STATUS_AGREE,
+ StrUtil.format(FlowTypeEnum.TUAN_DUI_FAIL_DES.getDescrition(), amountMember));
+ dappFundFlowDao.insert(fundFlowTuiJian);
+ continue;
+ }
createFlow(
multiplyUsdt,
memberId,
diff --git a/src/main/resources/templates/febs/views/modules/banner/coinSet.html b/src/main/resources/templates/febs/views/modules/banner/coinSet.html
index 1aa9c4f..6ae152b 100644
--- a/src/main/resources/templates/febs/views/modules/banner/coinSet.html
+++ b/src/main/resources/templates/febs/views/modules/banner/coinSet.html
@@ -272,8 +272,10 @@
});
$hdSubmit.on('click', function () {
- febs.post(ctx + 'admin/banner/hdSubmit', function (res) {
- febs.alert.success('操作成功');
+ febs.modal.confirm('确认释放滑点', '确认释放滑点？', function () {
+ febs.post(ctx + 'admin/banner/hdSubmit', function () {
+ febs.alert.success('操作成功');
+ });
});
});
});
--
Gitblit v1.9.1