From cbbc9d5e7df63bb1ea10bdd80e9a08660b82cc88 Mon Sep 17 00:00:00 2001
From: xiaoyong931011 <15274802129@163.com>
Date: Sat, 12 Aug 2023 16:01:10 +0800
Subject: [PATCH] 后台修改
---
src/main/java/cc/mrbird/febs/dapp/service/impl/DappSystemServiceImpl.java | 34 ++++++++++++++++++++++++++--------
1 files changed, 26 insertions(+), 8 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 24cc842..7e6a312 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
@@ -2456,6 +2456,7 @@
BigDecimal donateScore = amount.multiply(donateScorePercent);
dappWalletMineDao.updateBalance(donateScore,donateScore,memberId);
DappFundFlowEntity donateScoreFlow = new DappFundFlowEntity(
+ AccountFlowEnum.SCORE.getCode(),
memberId,
donateScore,
FundFlowEnum.DONATE_SCORE.getCode(),
@@ -2790,9 +2791,16 @@
String inviteId = dappMemberEntity.getInviteId();
//该用户全部的直推用户
List<DappMemberEntity> dappMemberEntities = dappMemberDao.selectChildMemberDirectOrNot(inviteId, 1, 1);
+ if(CollUtil.isEmpty(dappMemberEntities)){
+ continue;
+ }
for(DappMemberEntity directMember : dappMemberEntities){
if(1 != directMember.getActiveStatus()){
- return;
+ continue;
+ }
+ DappMemberEntity parentMember = dappMemberDao.selectMemberInfoByInviteId(directMember.getRefererId());
+ if(ObjectUtil.isEmpty(parentMember)){
+ continue;
}
Long directMemberId = directMember.getId();
@@ -2801,18 +2809,20 @@
DataDictionaryEnum.DIRECT_RELEASE.getCode()
);
if(ObjectUtil.isEmpty(directReleaseDic)){
- return;
+ continue;
}
BigDecimal directRelease = new BigDecimal(directReleaseDic.getValue() == null ? "0" : directReleaseDic.getValue());
if(BigDecimal.ZERO.compareTo(directRelease) >= 0){
- return;
+ continue;
}
- DappMemberEntity parentMember = dappMemberDao.selectMemberInfoByInviteId(dappMemberEntity.getRefererId());
/**
* 获取用户前一天的所有返利记录
*/
List<DappFundFlowEntity> dappFundFlowEntities = dappFundFlowDao.selectListByMemberIdAndTypeAndDate(directMemberId,
FundFlowEnum.STATIC_RELEASE.getCode(),DateUtil.offsetHour(DateUtil.date(),-12));
+ if(CollUtil.isEmpty(dappFundFlowEntities)){
+ continue;
+ }
for(DappFundFlowEntity dappFundFlowEntity : dappFundFlowEntities){
BigDecimal staticReleaseAmount = dappFundFlowEntity.getAmount();
BigDecimal directReleaseAmount = staticReleaseAmount.multiply(directRelease).setScale(2, BigDecimal.ROUND_DOWN);
@@ -2996,12 +3006,13 @@
totalScore,
amountMagic.negate(),
localTotalAchieve.negate(),
- FundFlowEnum.REDUCE_SCORE.getCode(),
+ AccountFlowEnum.SCORE.getCode(),
null);
dappAccountMoneyChangeDao.insert(reduceScoreAMC);
//插入积分流水
DappFundFlowEntity scoreFlow = new DappFundFlowEntity(
+ AccountFlowEnum.SCORE.getCode(),
memberId,
localTotalAchieve.negate(),
FundFlowEnum.REDUCE_SCORE_REAL.getCode(),
@@ -3027,11 +3038,12 @@
totalAmount,
amountMagic,
localTotalAchieve,
- FundFlowEnum.ADD_AMOUNT_REAL.getCode(),
+ AccountFlowEnum.AMOUNT.getCode(),
null);
dappAccountMoneyChangeDao.insert(addAmountAMC);
//插入余额流水
DappFundFlowEntity amountFlow = new DappFundFlowEntity(
+ AccountFlowEnum.AMOUNT.getCode(),
memberId,
localTotalAchieve,
FundFlowEnum.ADD_AMOUNT_REAL.getCode(),
@@ -3048,10 +3060,10 @@
DappAccountMoneyChangeEntity record = new DappAccountMoneyChangeEntity(
memberId,
+ totalAmount,
amountMagic,
- maxReleaseMember,
localTotalAchieve,
- FundFlowEnum.AMOUNT_RECORD.getCode(),
+ AccountFlowEnum.AMOUNT_RECORD.getCode(),
null);
dappAccountMoneyChangeDao.insert(record);
@@ -3269,29 +3281,35 @@
}
//生成一条静态补贴的流水
DappFundFlowEntity realUsdtAmountFlow = new DappFundFlowEntity(
+ AccountFlowEnum.AMOUNT.getCode(),
parentMember.getId(),
realScoreReduce,
fundFlowEnumType,
DappFundFlowEntity.WITHDRAW_STATUS_AGREE,
BigDecimal.ZERO,
+ null,
orderId);
dappFundFlowDao.insert(realUsdtAmountFlow);
//插入积分流水
DappFundFlowEntity scoreFlow = new DappFundFlowEntity(
+ AccountFlowEnum.SCORE.getCode(),
parentMember.getId(),
realScoreReduce.negate(),
FundFlowEnum.REDUCE_SCORE.getCode(),
DappFundFlowEntity.WITHDRAW_STATUS_AGREE,
BigDecimal.ZERO,
+ null,
orderId);
dappFundFlowDao.insert(scoreFlow);
//插入余额流水
DappFundFlowEntity amountFlow = new DappFundFlowEntity(
+ AccountFlowEnum.AMOUNT.getCode(),
parentMember.getId(),
realScoreReduce,
FundFlowEnum.ADD_AMOUNT.getCode(),
DappFundFlowEntity.WITHDRAW_STATUS_AGREE,
BigDecimal.ZERO,
+ null,
orderId);
dappFundFlowDao.insert(amountFlow);
return realScoreReduce;
--
Gitblit v1.9.1