From f52cfc92db48d9a215d7f728ce4000de1cdd6ae2 Mon Sep 17 00:00:00 2001
From: KKSU <15274802129@163.com>
Date: Tue, 10 Sep 2024 09:55:31 +0800
Subject: [PATCH] 增加会员升级日志打印
---
src/main/java/cc/mrbird/febs/mall/service/impl/AgentServiceImpl.java | 223 +++++++++++++++++++++++++++++++++++++------------------
1 files changed, 148 insertions(+), 75 deletions(-)
diff --git a/src/main/java/cc/mrbird/febs/mall/service/impl/AgentServiceImpl.java b/src/main/java/cc/mrbird/febs/mall/service/impl/AgentServiceImpl.java
index 03d340b..6b1a582 100644
--- a/src/main/java/cc/mrbird/febs/mall/service/impl/AgentServiceImpl.java
+++ b/src/main/java/cc/mrbird/febs/mall/service/impl/AgentServiceImpl.java
@@ -837,14 +837,14 @@
- public static void main(String[] args) {
- DateTime dateTime = DateUtil.parseDate("2024-3-27");
- System.out.println(dateTime);
- System.out.println(DateUtil.compare(DateUtil.date(),dateTime));
- if(DateUtil.compare(DateUtil.date(),dateTime)<= 0){
- System.out.println(dateTime);
- }
- }
+// public static void main(String[] args) {
+// DateTime dateTime = DateUtil.parseDate("2024-3-27");
+// System.out.println(dateTime);
+// System.out.println(DateUtil.compare(DateUtil.date(),dateTime));
+// if(DateUtil.compare(DateUtil.date(),dateTime)<= 0){
+// System.out.println(dateTime);
+// }
+// }
@Override
public void BuyToSell() {
/**
@@ -1053,6 +1053,56 @@
}
}
+ public void createPerk(MallMember mallMember,BigDecimal basicPerkDirect){
+ /**
+ * 如果用户是冻结，则直接销毁
+ */
+ Integer isFrozen = mallMember.getIsFrozen();
+ if(ProductEnum.MEMBER_FROZEN.getValue() == isFrozen){
+ MallMemberAmount mallMemberAmountMine = mallMemberAmountMapper.selectByMemberId(mallMember.getId());
+ if(BigDecimal.ZERO.compareTo(mallMemberAmountMine.getTotalPerk().subtract(basicPerkDirect)) >= 0){
+ return;
+ }
+ mallMemberAmountMine.setTotalPerk(mallMemberAmountMine.getTotalPerk().subtract(basicPerkDirect));
+ mallMemberAmountMapper.updateTrendsNftAndFrozenNftById(mallMemberAmountMine);
+ //插入一条流水记录
+ String orderNo = MallUtils.getOrderNum("FNFTW");
+ mallMoneyFlowService.addMoneyFlow(
+ mallMember.getId(),
+ basicPerkDirect.negate(),
+ MoneyFlowTypeNewEnum.BASIC_PERK_DIRECT_WRONG.getValue(),
+ orderNo,
+ null,
+ FlowTypeNewEnum.NFT.getValue(),
+ MoneyFlowTypeNewEnum.BASIC_PERK_DIRECT_WRONG.getDescrition(),
+ AppContants.MEMBER_FLOW_ING);
+
+ }else {
+ MallMemberAmount mallMemberAmountMine = mallMemberAmountMapper.selectByMemberId(mallMember.getId());
+ if(BigDecimal.ZERO.compareTo(mallMemberAmountMine.getTotalPerk().subtract(basicPerkDirect)) >= 0){
+ return;
+ }
+ mallMemberAmountMine.setTotalPerk(mallMemberAmountMine.getTotalPerk().subtract(basicPerkDirect));
+ mallMemberAmountMapper.updateTotalPerkById(mallMemberAmountMine);
+
+ MallMemberAmount mallMemberAmountNft = mallMemberAmountMapper.selectByMemberId(mallMember.getId());
+ mallMemberAmountNft.setTrendsNft(mallMemberAmountNft.getTrendsNft().add(basicPerkDirect));
+ mallMemberAmountMapper.updateTrendsNftById(mallMemberAmountNft);
+
+ //插入一条流水记录
+ String orderNo = MallUtils.getOrderNum("NFT");
+ mallMoneyFlowService.addMoneyFlow(
+ mallMember.getId(),
+ basicPerkDirect,
+ MoneyFlowTypeNewEnum.BASIC_PERK_DIRECT_DONE.getValue(),
+ orderNo,
+ null,
+ FlowTypeNewEnum.NFT.getValue(),
+ MoneyFlowTypeNewEnum.BASIC_PERK_DIRECT_DONE.getDescrition(),
+ AppContants.MEMBER_FLOW_DONE);
+ }
+ }
+
@Override
public void BuyToSellV2() {
List<MallProductBuy> mallProductBuys = mallProductBuyMapper.selectListByStateAndMateState(
@@ -1067,9 +1117,9 @@
for(MallProductBuy mallProductBuy : mallProductBuys){
MallProductNft mallProductNft = mallProductNftMapper.selectById(mallProductBuy.getProductNftId());
//周期
- int cycle = mallProductNft.getCycle();
+ int cycle = mallProductBuy.getCycle();
//收益率
- BigDecimal profitPercent = mallProductNft.getProfit();
+ BigDecimal profitPercent = mallProductBuy.getProfit();
Date payTime = mallProductBuy.getPayTime();
@@ -1157,67 +1207,13 @@
MallMemberAmount mallMemberAmountMine = mallMemberAmountMapper.selectByMemberId(mallProductBuy.getMemberId());
mallMemberAmountMine.setTrendsNft(mallMemberAmountMine.getTrendsNft().add(profit));
mallMemberAmountMapper.updateTrendsNftById(mallMemberAmountMine);
- }
- BigDecimal remainderDirect = bigDecimal.divide(new BigDecimal(String.valueOf(cycle)),0,BigDecimal.ROUND_DOWN);//取余
- if(remainderDirect.compareTo(BigDecimal.ONE) == 0){
/**
- * 更新用户上级收益，冻结7天，7天时间到期自动释放到动态钱包
+ * 团队奖励
+ *
*/
- Long memberId = mallProductBuy.getMemberId();
- MallMember mallMember = memberMapper.selectById(memberId);
+ MallMember mallMember = memberMapper.selectById(mallProductBuy.getMemberId());
if(ObjectUtil.isNotEmpty(mallMember)){
- if(DateUtil.compare(payTime,DateUtil.parseDate("2024-3-26"))<= 0){
- //直推
- String referrerId = mallMember.getReferrerId();
- MallMember directMember = memberMapper.selectInfoByInviteId(referrerId);
- if(ObjectUtil.isNotEmpty(directMember)){
- BigDecimal basicPerkDirectPercent = new BigDecimal(dataDictionaryCustomMapper.selectDicDataByTypeAndCode(
- DataDictionaryEnum.BASIC_PERK_DIRECT.getType(),
- DataDictionaryEnum.BASIC_PERK_DIRECT.getCode()
- ).getValue()).multiply(new BigDecimal("0.01"));
-// BigDecimal basicPerkDirect = profit.multiply(basicPerkDirectPercent).setScale(2, BigDecimal.ROUND_DOWN);
- BigDecimal basicPerkDirect = nftTotal.multiply(basicPerkDirectPercent).setScale(2, BigDecimal.ROUND_DOWN);
-
- if(ProductEnum.MEMBER_FROZEN.getValue() == directMember.getIsFrozen()){
- //插入一条流水记录
- String orderNo = MallUtils.getOrderNum("FNFTW");
- mallMoneyFlowService.addMoneyFlow(
- directMember.getId(),
- profit.negate(),
- MoneyFlowTypeNewEnum.BASIC_PERK_DIRECT_WRONG.getValue(),
- orderNo,
- null,
- FlowTypeNewEnum.NFT.getValue(),
- MoneyFlowTypeNewEnum.BASIC_PERK_DIRECT_WRONG.getDescrition(),
- AppContants.MEMBER_FLOW_ING);
-
- }else{
- /**
- * 先插入流水记录，然后定时器每小时，循环一次找寻对应的数据执行
- */
- String orderNo = MallUtils.getOrderNum("DNFT");
- mallMoneyFlowService.addMoneyFlow(
- directMember.getId(),
- basicPerkDirect,
- MoneyFlowTypeNewEnum.BASIC_PERK_DIRECT.getValue(),
- orderNo,
- null,
- FlowTypeNewEnum.NFT.getValue(),
- MoneyFlowTypeNewEnum.BASIC_PERK_DIRECT.getDescrition(),
- AppContants.MEMBER_FLOW_ING);
-
- MallMemberAmount mallMemberAmountDirect = mallMemberAmountMapper.selectByMemberId(directMember.getId());
- mallMemberAmountDirect.setFrozenNft(mallMemberAmountDirect.getFrozenNft().add(basicPerkDirect));
- mallMemberAmountMapper.updateFrozenNftById(mallMemberAmountDirect);
- }
- }
- }
-
- /**
- * 团队奖励
- *
- */
String level = MemberLevelNewEnum.ZERO_LEVEL.getType();
BigDecimal equalsPerkBasic = BigDecimal.ZERO;//平级收益，假设平级，则算平级收益的百分比收益
boolean flag = false;
@@ -1231,12 +1227,20 @@
//会员等级为ZERO_LEVEL，则不参与团队返佣
if(!MemberLevelNewEnum.ZERO_LEVEL.getType().equals(levelRef)){
int compareLevel = MemberLevelNewEnum.ZERO_LEVEL.compareLevel(level, levelRef);
+
DataDictionaryCustom dataDictionaryCustom = dataDictionaryCustomMapper.selectDicDataByTypeAndCode(
levelRef, levelRef
);
TeamPerkDto teamPerkDto = JSONObject.parseObject(dataDictionaryCustom.getValue(), TeamPerkDto.class);
+
+ DataDictionaryCustom dataDictionaryCustomLevel = dataDictionaryCustomMapper.selectDicDataByTypeAndCode(
+ level, level
+ );
+ TeamPerkDto teamPerkDtoLevel = JSONObject.parseObject(dataDictionaryCustomLevel.getValue(), TeamPerkDto.class);
if(compareLevel == 0){//团队奖励
- BigDecimal PerkPercent = new BigDecimal(teamPerkDto.getPerkPercent())
+ BigDecimal subtract = new BigDecimal(teamPerkDto.getPerkPercent()).subtract(new BigDecimal(teamPerkDtoLevel.getPerkPercent()));
+
+ BigDecimal PerkPercent = subtract
.multiply(new BigDecimal("0.01"));
BigDecimal teamPerk = PerkPercent.multiply(profit).setScale(2,BigDecimal.ROUND_DOWN);
/**
@@ -1281,10 +1285,52 @@
}
}
}
+
+ BigDecimal remainderDirect = bigDecimal.divide(new BigDecimal(String.valueOf(cycle)),0,BigDecimal.ROUND_DOWN);//取余
+ if(remainderDirect.compareTo(BigDecimal.ONE) == 0){
+ /**
+ * 更新用户上级收益，冻结7天，7天时间到期自动释放到动态钱包
+ */
+ Long memberId = mallProductBuy.getMemberId();
+ MallMember mallMember = memberMapper.selectById(memberId);
+ if(ObjectUtil.isNotEmpty(mallMember)){
+ if(DateUtil.compare(payTime,DateUtil.parseDate("2024-3-26"))<= 0){
+ //直推
+ String referrerId = mallMember.getReferrerId();
+ MallMember directMember = memberMapper.selectInfoByInviteId(referrerId);
+ if(ObjectUtil.isNotEmpty(directMember)){
+ BigDecimal basicPerkDirectPercent = new BigDecimal(dataDictionaryCustomMapper.selectDicDataByTypeAndCode(
+ DataDictionaryEnum.BASIC_PERK_DIRECT.getType(),
+ DataDictionaryEnum.BASIC_PERK_DIRECT.getCode()
+ ).getValue()).multiply(new BigDecimal("0.01"));
+
+ BigDecimal basicPerkDirect = nftTotal.multiply(basicPerkDirectPercent).setScale(2, BigDecimal.ROUND_DOWN);
+ /**
+ * 如果用户是冻结，则直接销毁
+ */
+ createPerk(directMember,basicPerkDirect.multiply(new BigDecimal("0.5")));
+ if(StrUtil.isNotEmpty(directMember.getReferrerId())){
+ MallMember directMemberDirect = memberMapper.selectInfoByInviteId(directMember.getReferrerId());
+ createPerk(directMemberDirect,basicPerkDirect.multiply(new BigDecimal("0.5")));
+ }
+ }
+ }
+ }
+ }
}
}
log.info("返利总条数："+ fanliSize);
+ }
+
+ public static void main(String[] args) {
+ DateTime payTime = DateUtil.parseDate("2024-05-24 14:17:02");
+ DateTime nowTime = DateUtil.parseDate("2024-06-8 02:00:00");
+ String s = String.valueOf(DateUtil.between(payTime, nowTime, DateUnit.DAY));//相差日期天数
+ BigDecimal bigDecimal = new BigDecimal(s).setScale(0, BigDecimal.ROUND_DOWN);//只取整数位
+ System.out.println(bigDecimal);
+ BigDecimal remainder = bigDecimal.remainder(new BigDecimal(String.valueOf(5)));//取余
+ System.out.println(remainder);
}
@Override
@@ -1911,6 +1957,7 @@
@Override
public void memberLevelUp() {
+ log.info("会员等级升级");
/**
* 获取当前所有的已完成、未转换的买单的用户
*/
@@ -1937,10 +1984,13 @@
if(ObjectUtil.isEmpty(mallMemberRef)){
continue;
}
- List<MallMember> mallMembersAll = memberMapper.selectAllChildAgentListByInviteId(referrerId);
- if(ObjectUtil.isEmpty(mallMembersAll)){
- continue;
- }
+// if(mallMemberRef.getId() != 2366L){
+// continue;
+// }
+// List<MallMember> mallMembersAll = memberMapper.selectAllChildAgentListByInviteId(referrerId);
+// if(ObjectUtil.isEmpty(mallMembersAll)){
+// continue;
+// }
List<MallMember> mallMembers = memberMapper.selectByRefererId(referrerId);
Set<Long> mallMembersSet = mallMembers.stream().map(MallMember::getId).collect(Collectors.toSet());
mallMembersSet.retainAll(collect);
@@ -1966,14 +2016,37 @@
Integer directCntLevel = teamPerkDto.getDirectCnt();
Integer teamCnt = teamPerkDto.getTeamCnt();
if(directCntLevel <= intersection.size()){
- if(teamCnt <= mallMembersAll.size()){
+ int levelCode = MemberLevelNewEnum.ZERO_LEVEL.getLevelCode(level);
+
+ List<MallMember> mallMembersAll = new ArrayList<>();
+ if(levelCode > 1){
+ String levelType = MemberLevelNewEnum.ZERO_LEVEL.getLevelType(levelCode - 1);
+ List<MallMember> mallMembersDirects = memberMapper.selectByRefererId(mallMemberRef.getInviteId());
+ for(MallMember memberDirect : mallMembersDirects){
+ List<MallMember> mallMembers1 = memberMapper.selectMemberWithLevelAndMemberIdNew(levelType, memberDirect.getInviteId());
+ if(CollUtil.isEmpty(mallMembers1)){
+ continue;
+ }
+ mallMembersAll.add(memberDirect);
+ }
+ }else{
+ String levelType = MemberLevelNewEnum.ZERO_LEVEL.getLevelType(0);
+ mallMembersAll = memberMapper.selectMemberWithLevelAndMemberId(levelType,mallMemberRef.getInviteId());
+ }
+
+ Set<Long> collectAll = mallMembersAll.stream().map(MallMember::getId).collect(Collectors.toSet());
+ Collection<Long> intersection1 = CollUtil.intersection(collectAll, collect);
+ if(teamCnt <= (CollUtil.isEmpty(intersection1) ? 0 : intersection1.size())){
+ if(!MemberLevelNewEnum.ZERO_LEVEL.getType().equals(level)){
+ log.info("{},有效人数为：{}，升级成为：{}，由于：{}",mallMemberRef.getAccountLogin(),intersection1,level,mallMember.getAccountLogin());
+ }
mallMemberRef.setLevel(level);
memberMapper.updateById(mallMemberRef);
String nextLevel = MemberLevelNewEnum.ZERO_LEVEL.getNextLevel(level);
level = nextLevel;
- if(level.equals(MemberLevelNewEnum.WU_LEVEL.getType()) &&
- nextLevel.equals(MemberLevelNewEnum.WU_LEVEL.getType()) ){
+ if(level.equals(MemberLevelNewEnum.SIX_LEVEL.getType()) &&
+ nextLevel.equals(MemberLevelNewEnum.SIX_LEVEL.getType()) ){
mallMemberRef.setLevel(level);
memberMapper.updateById(mallMemberRef);
flag = true;
--
Gitblit v1.9.1