From 1df98158a5b26c03db22c865ddb302946e6ccdca Mon Sep 17 00:00:00 2001
From: KKSU <15274802129@163.com>
Date: Wed, 10 Jul 2024 10:10:46 +0800
Subject: [PATCH] 后台
---
src/main/java/cc/mrbird/febs/mall/service/impl/AgentServiceImpl.java | 447 ++++++++++++++++++++++++++++++++++++++++++++++++-------
1 files changed, 391 insertions(+), 56 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 283a904..8642dcf 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
@@ -3,37 +3,28 @@
import cc.mrbird.febs.common.enumerates.*;
import cc.mrbird.febs.common.utils.AppContants;
import cc.mrbird.febs.common.utils.MallUtils;
-import cc.mrbird.febs.mall.dto.ScoreSettingDto;
import cc.mrbird.febs.mall.dto.TeamPerkDto;
import cc.mrbird.febs.mall.entity.*;
import cc.mrbird.febs.mall.mapper.*;
import cc.mrbird.febs.mall.service.*;
-import cc.mrbird.febs.mall.vo.AdminMallMoneyFlowVo;
-import cc.mrbird.febs.mall.vo.AdminTeamEqualsPerkVo;
import cc.mrbird.febs.rabbit.producter.AgentProducer;
-import cc.mrbird.febs.system.mapper.UserMapper;
import cn.hutool.core.collection.CollUtil;
import cn.hutool.core.date.DateTime;
import cn.hutool.core.date.DateUnit;
import cn.hutool.core.date.DateUtil;
-import cn.hutool.core.math.MathUtil;
import cn.hutool.core.util.ObjectUtil;
import cn.hutool.core.util.StrUtil;
-import cn.hutool.json.JSONUtil;
import com.alibaba.fastjson.JSONObject;
-import com.baomidou.mybatisplus.core.conditions.Wrapper;
import com.baomidou.mybatisplus.core.conditions.query.QueryWrapper;
import lombok.RequiredArgsConstructor;
import lombok.extern.slf4j.Slf4j;
import org.apache.ibatis.session.ExecutorType;
import org.apache.ibatis.session.SqlSession;
import org.mybatis.spring.SqlSessionTemplate;
-import org.springframework.beans.factory.annotation.Autowired;
import org.springframework.stereotype.Service;
import org.springframework.transaction.annotation.Transactional;
import java.math.BigDecimal;
-import java.math.RoundingMode;
import java.util.*;
import java.util.stream.Collectors;
@@ -846,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() {
/**
@@ -1062,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(
@@ -1070,12 +1111,15 @@
if(CollUtil.isEmpty(mallProductBuys)){
return;
}
+
+ log.info("等待返利总条数："+ (CollUtil.isEmpty(mallProductBuys) ? 0 : mallProductBuys.size()));
+ Integer fanliSize = 0;
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();
@@ -1100,6 +1144,7 @@
BigDecimal totalPerk = mallProductBuy.getTotalPerk();
if(BigDecimal.ZERO.compareTo(totalPerk) >= 0){
mallProductBuy.setTotalPerk(BigDecimal.ZERO);
+ mallProductBuy.setMateState(ProductEnum.PRODUCT_BUY_MATE_STATE_SUCCESS.getValue());
mallProductBuyMapper.updateById(mallProductBuy);
continue;
}
@@ -1128,21 +1173,268 @@
mallMemberAmountMapper.updateTotalPerkById(mallMemberAmountPerk);
}
// insertSell(mallProductBuy.getMemberId(),profit,profit,BigDecimal.ZERO,BigDecimal.ZERO);
- String orderNoSY = MallUtils.getOrderNum("SYNFT");
- mallMoneyFlowService.addMoneyFlow(
- mallProductBuy.getMemberId(),
- profit,
- MoneyFlowTypeNewEnum.PERK_CYCLE.getValue(),
- orderNoSY,
- null,
- FlowTypeNewEnum.NFT.getValue(),
- MoneyFlowTypeNewEnum.PERK_CYCLE.getDescrition(),
- AppContants.MEMBER_FLOW_DONE);
- MallMemberAmount mallMemberAmountMine = mallMemberAmountMapper.selectByMemberId(mallProductBuy.getMemberId());
- mallMemberAmountMine.setTrendsNft(mallMemberAmountMine.getTrendsNft().add(profit));
- mallMemberAmountMapper.updateTrendsNftById(mallMemberAmountMine);
+ MallMember mallMemberMe = memberMapper.selectById(mallProductBuy.getMemberId());
+ if(ObjectUtil.isEmpty(mallMemberMe)){
+ continue;
+ }
+ if(ProductEnum.MEMBER_FROZEN.getValue() == mallMemberMe.getIsFrozen()){
+ //插入一条流水记录
+ String orderNo = MallUtils.getOrderNum("FNFTW");
+ mallMoneyFlowService.addMoneyFlow(
+ mallProductBuy.getMemberId(),
+ profit.negate(),
+ MoneyFlowTypeNewEnum.BASIC_PERK_DIRECT_WRONG.getValue(),
+ orderNo,
+ null,
+ FlowTypeNewEnum.NFT.getValue(),
+ MoneyFlowTypeNewEnum.BASIC_PERK_DIRECT_WRONG.getDescrition(),
+ AppContants.MEMBER_FLOW_ING);
+ }else{
+ fanliSize = fanliSize +1;
+ String orderNoSY = MallUtils.getOrderNum("SYNFT");
+ mallMoneyFlowService.addMoneyFlow(
+ mallProductBuy.getMemberId(),
+ profit,
+ MoneyFlowTypeNewEnum.PERK_CYCLE.getValue(),
+ orderNoSY,
+ null,
+ FlowTypeNewEnum.NFT.getValue(),
+ MoneyFlowTypeNewEnum.PERK_CYCLE.getDescrition(),
+ AppContants.MEMBER_FLOW_DONE);
+
+ 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);
+ 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")));
+ }
+ }
+ }
+
+ /**
+ * 团队奖励
+ *
+ */
+ String level = MemberLevelNewEnum.ZERO_LEVEL.getType();
+ BigDecimal equalsPerkBasic = BigDecimal.ZERO;//平级收益，假设平级，则算平级收益的百分比收益
+ boolean flag = false;
+ String parentId = mallMember.getReferrerId();
+ if (StrUtil.isBlank(parentId)) {
+ flag = true;
+ }
+ while (!flag) {
+ MallMember mallMemberRef = memberMapper.selectInfoByInviteId(parentId);
+ String levelRef = mallMemberRef.getLevel();
+ //会员等级为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 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);
+ /**
+ * 先插入流水记录，然后定时器循环,找寻对应的数据执行
+ */
+ String orderNo = MallUtils.getOrderNum("TNFT");
+
+ if(teamPerk.compareTo(BigDecimal.ZERO) > 0){
+ insertFlowUpdateFrozenNft(
+ orderNo,
+ mallMemberRef.getId(),
+ teamPerk,
+ MoneyFlowTypeNewEnum.TEAM_PERK_DIRECT.getValue(),
+ FlowTypeNewEnum.NFT.getValue(),
+ MoneyFlowTypeNewEnum.TEAM_PERK_DIRECT.getDescrition(),
+ AppContants.MEMBER_FLOW_ING);
+ }
+ equalsPerkBasic = teamPerk;
+ level = levelRef;
+ }else if(compareLevel == 2){//平级奖励
+ BigDecimal equalsPerkPercent = new BigDecimal(teamPerkDto.getEqualsPerkPercent())
+ .multiply(new BigDecimal("0.01"));
+ BigDecimal equalsPerk = equalsPerkPercent.multiply(equalsPerkBasic).setScale(2,BigDecimal.ROUND_DOWN);
+ String orderNo = MallUtils.getOrderNum("PJNFT");
+ if(equalsPerk.compareTo(BigDecimal.ZERO) > 0){
+ insertFlowUpdateFrozenNft(
+ orderNo,
+ mallMemberRef.getId(),
+ equalsPerk,
+ MoneyFlowTypeNewEnum.TEAM_PERK_EQUALS.getValue(),
+ FlowTypeNewEnum.NFT.getValue(),
+ MoneyFlowTypeNewEnum.TEAM_PERK_EQUALS.getDescrition(),
+ AppContants.MEMBER_FLOW_ING);
+ }
+ equalsPerkBasic = equalsPerk;
+ }
+ }
+ parentId = mallMemberRef.getReferrerId();
+ if (StrUtil.isBlank(mallMemberRef.getReferrerId())) {
+ flag = true;
+ }
+ }
+ }
+ }
+ }
+ }
+
+ 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
+ public void BuyToSellV3(DateTime date) {
+ List<MallProductBuy> mallProductBuys = mallProductBuyMapper.selectListByStateAndMateState(
+ ProductEnum.PRODUCT_BUY_SUCCESS.getValue(),
+ ProductEnum.PRODUCT_BUY_MATE_STATE_FAIL.getValue());
+ if(CollUtil.isEmpty(mallProductBuys)){
+ return;
+ }
+
+ log.info("等待返利总条数："+ (CollUtil.isEmpty(mallProductBuys) ? 0 : mallProductBuys.size()));
+ Integer fanliSize = 0;
+ for(MallProductBuy mallProductBuy : mallProductBuys){
+ MallProductNft mallProductNft = mallProductNftMapper.selectById(mallProductBuy.getProductNftId());
+ //周期
+ int cycle = mallProductNft.getCycle();
+ //收益率
+ BigDecimal profitPercent = mallProductNft.getProfit();
+ Date payTime = mallProductBuy.getPayTime();
+
+
+// //偏移时间--
+// DateTime dateTime = DateUtil.offsetDay(payTime, cycle);
+// int compare = DateUtil.compare(now, dateTime);
+// if(compare >= 0){
+// mallProductBuy.setMateState(ProductEnum.PRODUCT_BUY_MATE_STATE_SUCCESS.getValue());
+// mallProductBuyMapper.updateById(mallProductBuy);
+ //偏移时间
+ String s = String.valueOf(DateUtil.between(payTime, date, DateUnit.DAY));//相差日期天数
+ BigDecimal bigDecimal = new BigDecimal(s).setScale(0, BigDecimal.ROUND_DOWN);//只取整数位
+ if(bigDecimal.compareTo(BigDecimal.ZERO) <= 0){
+ continue;
+ }
+ BigDecimal remainder = bigDecimal.remainder(new BigDecimal(String.valueOf(cycle)));//取余
+ if (remainder.compareTo(BigDecimal.ZERO) == 0) {
+ /**
+ * 用户的账户增加对应的收益
+ */
+
+ BigDecimal totalPerk = mallProductBuy.getTotalPerk();
+ if(BigDecimal.ZERO.compareTo(totalPerk) >= 0){
+ mallProductBuy.setTotalPerk(BigDecimal.ZERO);
+ mallProductBuy.setMateState(ProductEnum.PRODUCT_BUY_MATE_STATE_SUCCESS.getValue());
+ mallProductBuyMapper.updateById(mallProductBuy);
+ continue;
+ }
+ BigDecimal nftTotal = mallProductBuy.getNftTotal();
+ BigDecimal profit = nftTotal.multiply(profitPercent.multiply(new BigDecimal(0.01))).setScale(2,BigDecimal.ROUND_DOWN);
+
+ if(totalPerk.compareTo(profit) <= 0){
+ profit = totalPerk;
+ mallProductBuy.setTotalPerk(BigDecimal.ZERO);
+ mallProductBuyMapper.updateById(mallProductBuy);
+ }else{
+ mallProductBuy.setTotalPerk(totalPerk.subtract(profit).setScale(2,BigDecimal.ROUND_DOWN));
+ mallProductBuyMapper.updateById(mallProductBuy);
+ }
+
+ MallMemberAmount mallMemberAmountPerk = mallMemberAmountMapper.selectByMemberId(mallProductBuy.getMemberId());
+ if(BigDecimal.ZERO.compareTo(mallMemberAmountPerk.getTotalPerk()) >= 0){
+ continue;
+ }
+ if(mallMemberAmountPerk.getTotalPerk().compareTo(profit) <= 0){
+ profit = mallMemberAmountPerk.getTotalPerk();
+ mallMemberAmountPerk.setTotalPerk(BigDecimal.ZERO);
+ mallMemberAmountMapper.updateTotalPerkById(mallMemberAmountPerk);
+ }else{
+ mallMemberAmountPerk.setTotalPerk(mallMemberAmountPerk.getTotalPerk().subtract(profit).setScale(2,BigDecimal.ROUND_DOWN));
+ mallMemberAmountMapper.updateTotalPerkById(mallMemberAmountPerk);
+ }
+// insertSell(mallProductBuy.getMemberId(),profit,profit,BigDecimal.ZERO,BigDecimal.ZERO);
+
+ MallMember mallMemberMe = memberMapper.selectById(mallProductBuy.getMemberId());
+ if(ObjectUtil.isEmpty(mallMemberMe)){
+ continue;
+ }
+ if(ProductEnum.MEMBER_FROZEN.getValue() == mallMemberMe.getIsFrozen()){
+ //插入一条流水记录
+ String orderNo = MallUtils.getOrderNum("FNFTW");
+ mallMoneyFlowService.addMoneyFlow(
+ mallProductBuy.getMemberId(),
+ profit.negate(),
+ MoneyFlowTypeNewEnum.BASIC_PERK_DIRECT_WRONG.getValue(),
+ orderNo,
+ null,
+ FlowTypeNewEnum.NFT.getValue(),
+ MoneyFlowTypeNewEnum.BASIC_PERK_DIRECT_WRONG.getDescrition(),
+ AppContants.MEMBER_FLOW_ING);
+
+ }else{
+ fanliSize = fanliSize +1;
+ String orderNoSY = MallUtils.getOrderNum("SYNFT");
+ mallMoneyFlowService.addMoneyFlow(
+ mallProductBuy.getMemberId(),
+ profit,
+ MoneyFlowTypeNewEnum.PERK_CYCLE.getValue(),
+ orderNoSY,
+ null,
+ FlowTypeNewEnum.NFT.getValue(),
+ MoneyFlowTypeNewEnum.PERK_CYCLE.getDescrition(),
+ AppContants.MEMBER_FLOW_DONE);
+
+ 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){
@@ -1163,25 +1455,40 @@
).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);
- /**
- * 先插入流水记录，然后定时器每小时，循环一次找寻对应的数据执行
- */
- 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);
+ 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);
+ }
}
-
}
/**
@@ -1253,6 +1560,8 @@
}
}
}
+
+ log.info("返利总条数："+ fanliSize);
}
/**
@@ -1273,6 +1582,12 @@
MallMemberAmount mallMemberAmountDirect = mallMemberAmountMapper.selectByMemberId(memberId);
mallMemberAmountDirect.setFrozenNft(mallMemberAmountDirect.getFrozenNft().add(perk));
mallMemberAmountMapper.updateFrozenNftById(mallMemberAmountDirect);
+
+
+
+ MallMemberAmount mallMemberAmountTotalPerk = mallMemberAmountMapper.selectByMemberId(memberId);
+ mallMemberAmountTotalPerk.setTotalPerk(mallMemberAmountTotalPerk.getTotalPerk().subtract(perk));
+ mallMemberAmountMapper.updateTotalPerkById(mallMemberAmountTotalPerk);
}
@Override
@@ -1665,10 +1980,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);
@@ -1694,14 +2012,31 @@
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.selectMemberWithLevelAndMemberId(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());
+ }
+ if(teamCnt <= (CollUtil.isEmpty(mallMembersAll) ? 0 : mallMembersAll.size())){
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