From b905434d94ad78311fd5eda6378fea51014cb759 Mon Sep 17 00:00:00 2001
From: xiaoyong931011 <15274802129@163.com>
Date: Fri, 11 Aug 2023 18:28:33 +0800
Subject: [PATCH] 数据修改
---
src/main/java/cc/mrbird/febs/dapp/service/impl/DappSystemServiceImpl.java | 19 ++++++++++++++-----
src/main/resources/application-dev.yml | 2 +-
src/main/resources/templates/febs/views/dapp/memberMoneyFlow.html | 1 +
3 files changed, 16 insertions(+), 6 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 a2facb7..83c594c 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
@@ -2790,9 +2790,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 +2808,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);
@@ -3048,8 +3057,8 @@
DappAccountMoneyChangeEntity record = new DappAccountMoneyChangeEntity(
memberId,
+ totalAmount,
amountMagic,
- maxReleaseMember,
localTotalAchieve,
AccountFlowEnum.AMOUNT_RECORD.getCode(),
null);
diff --git a/src/main/resources/application-dev.yml b/src/main/resources/application-dev.yml
index 1accb70..a69a21f 100644
--- a/src/main/resources/application-dev.yml
+++ b/src/main/resources/application-dev.yml
@@ -57,5 +57,5 @@
online-transfer: true
chain-listener: false
reset-job: false
- quartz-job: false
+ quartz-job: true
debug: false
\ No newline at end of file
diff --git a/src/main/resources/templates/febs/views/dapp/memberMoneyFlow.html b/src/main/resources/templates/febs/views/dapp/memberMoneyFlow.html
index 37b155a..c4d7707 100644
--- a/src/main/resources/templates/febs/views/dapp/memberMoneyFlow.html
+++ b/src/main/resources/templates/febs/views/dapp/memberMoneyFlow.html
@@ -15,6 +15,7 @@
var type = {
1: {title: '余额', color: 'orange'},
2: {title: '赠送积分', color: 'green'},
+ 3: {title: '前端显示', color: 'blue'},
}[d.type];
}}
<span class="layui-badge febs-bg-{{type.color}}">{{ type.title }}</span>
--
Gitblit v1.9.1