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 | 35 ++++++++++++++++++++++++++++++++++-
1 files changed, 34 insertions(+), 1 deletions(-)
diff --git a/src/main/java/cc/mrbird/febs/job/OnHookPlanJob.java b/src/main/java/cc/mrbird/febs/job/OnHookPlanJob.java
index b84d495..065731f 100644
--- a/src/main/java/cc/mrbird/febs/job/OnHookPlanJob.java
+++ b/src/main/java/cc/mrbird/febs/job/OnHookPlanJob.java
@@ -293,7 +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(date,endTime)>=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();
}
}
@@ -435,9 +439,38 @@
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)){
--
Gitblit v1.9.1