From 21b61754dce38193d780c998f49d5ca0ba66cd4f Mon Sep 17 00:00:00 2001
From: xiaoyong931011 <15274802129@163.com>
Date: Mon, 12 Dec 2022 09:48:09 +0800
Subject: [PATCH] 20221130
---
src/main/java/cc/mrbird/febs/job/OnHookPlanJob.java | 80 ++++++++++++++++++++++++++++++++--------
1 files changed, 64 insertions(+), 16 deletions(-)
diff --git a/src/main/java/cc/mrbird/febs/job/OnHookPlanJob.java b/src/main/java/cc/mrbird/febs/job/OnHookPlanJob.java
index 11f9cee..065731f 100644
--- a/src/main/java/cc/mrbird/febs/job/OnHookPlanJob.java
+++ b/src/main/java/cc/mrbird/febs/job/OnHookPlanJob.java
@@ -293,8 +293,11 @@
DataDictionaryCustom endTimeDic = dataDictionaryCustomMapper.selectDicDataByTypeAndCode(DataDictionaryEnum.END_TIME.getType(), DataDictionaryEnum.END_TIME.getCode());
DateTime date = DateUtil.date();
DateTime endTime = DateUtil.parseTimeToday(endTimeDic.getValue());
- if(DateUtil.compare(endTime,date)>=0){
- //
+
+ //系统开关
+ DataDictionaryCustom onOff = dataDictionaryCustomMapper.selectDicDataByTypeAndCode(DataDictionaryEnum.ON_OFF.getType(), DataDictionaryEnum.ON_OFF.getCode());
+ String onOffStr = onOff.getValue() == null ? "OFF":onOff.getValue();
+ if(DateUtil.compare(date,endTime)>=0 || "ON".equals(onOffStr)){
igtOnHookPlanOrderDao.updatePlanOrder();
}
}
@@ -422,37 +425,82 @@
Log.info("更新用户代理等级");
DateTime date = DateUtil.date();
//查询账户总金额大于51的有效用户
- List<DappMemberEntity> dappMemberEntities = dappWalletCoinDao.selectTotalAmount();
+ List<DappMemberEntity> dappMemberEntities = dappWalletCoinDao.selectByIdentity();
+// List<DappMemberEntity> dappMemberEntities = dappWalletCoinDao.selectTotalAmount();
if(CollUtil.isEmpty(dappMemberEntities)){
//没有账户金额大于51，则全部为会员
dappMemberDao.updateIdentity();
}else{
List<DappMemberEntity> LEVEL_IB = getMemberLevelList(dappMemberEntities, DataDictionaryEnum.LEVEL_MB.getCode(), DataDictionaryEnum.LEVEL_IB.getCode());
- List<DappMemberEntity> LEVEL_FIB = getMemberLevelList(LEVEL_IB, DataDictionaryEnum.LEVEL_IB.getCode(), DataDictionaryEnum.LEVEL_FIB.getCode());
- List<DappMemberEntity> LEVEL_CIB = getMemberLevelList(LEVEL_FIB, DataDictionaryEnum.LEVEL_FIB.getCode(), DataDictionaryEnum.LEVEL_CIB.getCode());
- List<DappMemberEntity> LEVEL_AIB = getMemberLevelList(LEVEL_CIB, DataDictionaryEnum.LEVEL_CIB.getCode(), DataDictionaryEnum.LEVEL_AIB.getCode());
- List<DappMemberEntity> LEVEL_GIB = getMemberLevelList(LEVEL_AIB, DataDictionaryEnum.LEVEL_AIB.getCode(), DataDictionaryEnum.LEVEL_GIB.getCode());
- List<DappMemberEntity> LEVEL_BP = getMemberLevelList(LEVEL_GIB, DataDictionaryEnum.LEVEL_GIB.getCode(), DataDictionaryEnum.LEVEL_BP.getCode());
- List<DappMemberEntity> LEVEL_SP = getMemberLevelList(LEVEL_BP, DataDictionaryEnum.LEVEL_BP.getCode(), DataDictionaryEnum.LEVEL_SP.getCode());
- List<DappMemberEntity> LEVEL_GP = getMemberLevelList(LEVEL_SP, DataDictionaryEnum.LEVEL_SP.getCode(), DataDictionaryEnum.LEVEL_GP.getCode());
+ List<DappMemberEntity> LEVEL_FIB = getMemberLevelList(dappMemberEntities, DataDictionaryEnum.LEVEL_IB.getCode(), DataDictionaryEnum.LEVEL_FIB.getCode());
+ List<DappMemberEntity> LEVEL_CIB = getMemberLevelList(dappMemberEntities, DataDictionaryEnum.LEVEL_FIB.getCode(), DataDictionaryEnum.LEVEL_CIB.getCode());
+ List<DappMemberEntity> LEVEL_AIB = getMemberLevelList(dappMemberEntities, DataDictionaryEnum.LEVEL_CIB.getCode(), DataDictionaryEnum.LEVEL_AIB.getCode());
+ List<DappMemberEntity> LEVEL_GIB = getMemberLevelList(dappMemberEntities, DataDictionaryEnum.LEVEL_AIB.getCode(), DataDictionaryEnum.LEVEL_GIB.getCode());
+ List<DappMemberEntity> LEVEL_BP = getMemberLevelList(dappMemberEntities, DataDictionaryEnum.LEVEL_GIB.getCode(), DataDictionaryEnum.LEVEL_BP.getCode());
+ List<DappMemberEntity> LEVEL_SP = getMemberLevelList(dappMemberEntities, DataDictionaryEnum.LEVEL_BP.getCode(), DataDictionaryEnum.LEVEL_SP.getCode());
+ List<DappMemberEntity> LEVEL_GP = getMemberLevelList(dappMemberEntities, DataDictionaryEnum.LEVEL_SP.getCode(), DataDictionaryEnum.LEVEL_GP.getCode());
+
+ //会员升级-只要下级存在某个等级，在这条线都直接升级为该等级
+ updateMemberLevelUp(DataDictionaryEnum.LEVEL_IB.getCode(),LEVEL_IB);
+ updateMemberLevelUp(DataDictionaryEnum.LEVEL_FIB.getCode(),LEVEL_FIB);
+ updateMemberLevelUp(DataDictionaryEnum.LEVEL_CIB.getCode(),LEVEL_CIB);
+ updateMemberLevelUp(DataDictionaryEnum.LEVEL_AIB.getCode(),LEVEL_AIB);
+ updateMemberLevelUp(DataDictionaryEnum.LEVEL_GIB.getCode(),LEVEL_GIB);
+ updateMemberLevelUp(DataDictionaryEnum.LEVEL_BP.getCode(),LEVEL_BP);
+ updateMemberLevelUp(DataDictionaryEnum.LEVEL_SP.getCode(),LEVEL_SP);
+ updateMemberLevelUp(DataDictionaryEnum.LEVEL_GP.getCode(),LEVEL_GP);
}
+ }
+
+ private void updateMemberLevelUp(String code,List<DappMemberEntity> dappMemberEntities){
+ if(CollUtil.isNotEmpty(dappMemberEntities)){
+ for(DappMemberEntity dappMemberEntity : dappMemberEntities){
+ String refererIds = dappMemberEntity.getRefererIds();
+ if(StrUtil.isNotEmpty(refererIds)){
+ List<String> strings = StrUtil.splitTrim(refererIds, ",");
+ for(String inviteId : strings){
+ DappMemberEntity memberEntity = dappMemberDao.selectMemberInfoByInviteId(inviteId);
+ if(ObjectUtil.isNotEmpty(memberEntity)){
+ memberEntity.setIdentity(code);
+ dappMemberDao.updateById(memberEntity);
+ }
+ }
+ }
+ }
+ }
+
}
private List<DappMemberEntity> getMemberLevelList(List<DappMemberEntity> dappMemberEntities,String identity,String identityNext){
List<DappMemberEntity> dappMemberEntitiesNext = new ArrayList<>();
if(CollUtil.isNotEmpty(dappMemberEntities)){
for(DappMemberEntity dappMemberEntity : dappMemberEntities){
+ if(ObjectUtil.isEmpty(dappMemberEntity)){
+ continue;
+ }
Long memberEntityId = dappMemberEntity.getId();
String refererId = dappMemberEntity.getRefererId();
String inviteId = dappMemberEntity.getInviteId();
- //下级是否存在三个账户总金额大于51的会员，并且代理等级为identity
- List<DappMemberEntity> levelMbMembers = dappMemberDao.selectTotalAmountByRefererIdAndIdentity(inviteId,identity);
- if(CollUtil.isNotEmpty(levelMbMembers) && 3 <= levelMbMembers.size()){
+ //是否存在三条以上的推广线路，存在才能升级,不满足则
+ List<DappMemberEntity> levelMbMembers = dappMemberDao.selectTotalMemberByRefererIdAndIdentity(inviteId);
+ if(3 > levelMbMembers.size()){
+// dappMemberEntity.setIdentity(DataDictionaryEnum.LEVEL_MB.getCode());
+// dappMemberDao.updateById(dappMemberEntity);
+ dappMemberDao.updateIdentityByMemberId(DataDictionaryEnum.LEVEL_MB.getCode(),memberEntityId);
+ continue;
+ }
+ int identityDown = 0;
+ for(DappMemberEntity dappMemberDown : levelMbMembers){
+ //下级是否存在账户总金额大于51的会员，并且代理等级为identity
+ List<DappMemberEntity> levelMbMembersDown = dappMemberDao.selectTotalAmountByRefererIdAndIdentity(dappMemberDown.getInviteId(),identity);
+ if(CollUtil.isNotEmpty(levelMbMembersDown)){
+ identityDown = identityDown + 1;
+ }
+
+ }
+ if(identityDown >= 3){
//设置identityNext级别
dappMemberDao.updateIdentityByMemberId(identityNext,memberEntityId);
- //获取他的上级会员信息
- DappMemberEntity dappMemberEntityNext = dappMemberDao.selectMemberInfoByInviteId(refererId);
- dappMemberEntitiesNext.add(dappMemberEntityNext);
}
}
}
--
Gitblit v1.9.1