From 930658f087df885f01cefbba30856303e0528c58 Mon Sep 17 00:00:00 2001
From: KKSU <15274802129@163.com>
Date: Sun, 04 Feb 2024 18:06:49 +0800
Subject: [PATCH] 确认收货更新用户的会员信息
---
src/main/java/cc/mrbird/febs/mall/service/impl/AgentServiceImpl.java | 253 ++++++++++++++++++++++++++++++++++----------------
1 files changed, 172 insertions(+), 81 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 eb22f3b..94871f7 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
@@ -14,12 +14,14 @@
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;
@@ -822,7 +824,17 @@
List<MallMember> thirdLevelRecord = getStarRecord(fourLevelRecord, MemberLevelEnum.THIRD_LEVEL.name(), amount, orderNo, 0L,MoneyFlowTypeEnum.STAR_PERK_THREE.getValue());
List<MallMember> secondLevelRecord = getStarRecord(thirdLevelRecord, MemberLevelEnum.SECOND_LEVEL.name(), amount, orderNo, 0L,MoneyFlowTypeEnum.STAR_PERK_TWO.getValue());
}
+ public static void main(String[] args) {
+ Long number = 0L; // 这里可以替换成你需要检查的数字
+ if (number % 3 == 0) {
+ System.out.println(number + " 可以被3整除");
+ } else {
+ System.out.println(number + " 不能被3整除");
+ }
+ DateTime nowTimeFormat = DateUtil.parseTime(DateUtil.formatTime(DateUtil.date()));
+ System.out.println(nowTimeFormat);
+ }
@Override
public void BuyToSell() {
/**
@@ -849,22 +861,46 @@
BigDecimal profitPercent = mallProductNft.getProfit();
for(MallProductBuy mallProductBuy : mallProductBuys){
+
+
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);
//偏移时间
- DateTime dateTime = DateUtil.offsetDay(payTime, cycle);
- int compare = DateUtil.compare(now, dateTime);
- if(compare >= 0){
+ String s = String.valueOf(DateUtil.between(payTime, DateUtil.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) {
/**
- * 更新买单状态
- * 收益生成一条卖单
- * 本金生成一条卖单
+ * 用户的账户增加对应的收益
*/
- mallProductBuy.setMateState(ProductEnum.PRODUCT_BUY_MATE_STATE_SUCCESS.getValue());
- mallProductBuyMapper.updateById(mallProductBuy);
BigDecimal nftTotal = mallProductBuy.getNftTotal();
- insertSell(mallProductBuy.getMemberId(),nftTotal,nftTotal,BigDecimal.ZERO,BigDecimal.ZERO);
BigDecimal profit = nftTotal.multiply(profitPercent.multiply(new BigDecimal(0.01)));
- insertSell(mallProductBuy.getMemberId(),profit,profit,BigDecimal.ZERO,BigDecimal.ZERO);
+// 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);
+
/**
* 更新用户上级收益，冻结7天，7天时间到期自动释放到动态钱包
@@ -880,7 +916,8 @@
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 = profit.multiply(basicPerkDirectPercent).setScale(2, BigDecimal.ROUND_DOWN);
+ BigDecimal basicPerkDirect = nftTotal.multiply(basicPerkDirectPercent).setScale(2, BigDecimal.ROUND_DOWN);
/**
* 先插入流水记录，然后定时器每小时，循环一次找寻对应的数据执行
*/
@@ -914,46 +951,51 @@
while (!flag) {
MallMember mallMemberRef = memberMapper.selectInfoByInviteId(parentId);
String levelRef = mallMemberRef.getLevel();
- int compareLevel = MemberLevelNewEnum.ZERO_LEVEL.compareLevel(level, levelRef);
- DataDictionaryCustom dataDictionaryCustom = dataDictionaryCustomMapper.selectDicDataByTypeAndCode(
- levelRef, levelRef
- );
- TeamPerkDto teamPerkDto = JSONObject.parseObject(dataDictionaryCustom.getValue(), TeamPerkDto.class);
- if(compareLevel == 0){//团队奖励
- BigDecimal PerkPercent = new BigDecimal(teamPerkDto.getPerkPercent());
- BigDecimal teamPerk = PerkPercent.multiply(profit).setScale(2,BigDecimal.ROUND_DOWN);
- /**
- * 先插入流水记录，然后定时器循环,找寻对应的数据执行
- */
- String orderNo = MallUtils.getOrderNum("TNFT");
+ //会员等级为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);
+ if(compareLevel == 0){//团队奖励
+ BigDecimal PerkPercent = new BigDecimal(teamPerkDto.getPerkPercent())
+ .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);
+ 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;
}
- equalsPerkBasic = teamPerk;
- level = levelRef;
- }else if(compareLevel == 2){//平级奖励
- BigDecimal equalsPerkPercent = new BigDecimal(teamPerkDto.getEqualsPerkPercent());
- 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())) {
@@ -1010,30 +1052,6 @@
* 3、更新卖单子表的数据
*/
agentProducer.sendFcmOrderBuyCancelMsg(mallProductBuyRecord.getId());
-
-// Long buyId = mallProductBuyRecord.getBuyId();
-// Long sellRecordId = mallProductBuyRecord.getSellRecordId();
-// MallProductBuy mallProductBuy = mallProductBuyMapper.selectById(buyId);
-// Long memberIdBuy = mallProductBuy.getMemberId();
-// //冻结账户
-// MallMember mallMemberBuy = memberMapper.selectById(memberIdBuy);
-// mallMemberBuy.setIsFrozen(ProductEnum.MEMBER_FROZEN.getValue());
-// memberMapper.updateById(mallMemberBuy);
-// //更新买单子表的数据
-// mallProductBuyRecord.setState(ProductEnum.PRODUCT_MATE_STATE_FAIL.getValue());
-// mallProductBuyRecordMapper.updateById(mallProductBuyRecord);
-// //更新买单主表
-// mallProductBuy.setNftAva(mallProductBuy.getNftAva().add(mallProductBuyRecord.getPickNftCnt()));
-// mallProductBuyMapper.updateById(mallProductBuy);
-// //更新卖单子表的数据
-// MallProductSellRecord mallProductSellRecord = mallProductSellRecordMapper.selectById(sellRecordId);
-// mallProductSellRecord.setState(ProductEnum.PRODUCT_MATE_STATE_FAIL.getValue());
-// mallProductSellRecordMapper.updateById(mallProductSellRecord);
-// //更新卖单主表
-// Long sellId = mallProductSellRecord.getSellId();
-// MallProductSell mallProductSell = mallProductSellMapper.selectById(sellId);
-// mallProductSell.setNftCntAva(mallProductSell.getNftCntAva().add(mallProductSellRecord.getNftCnt()));
-// mallProductSellMapper.updateById(mallProductSell);
}
}
}
@@ -1080,12 +1098,16 @@
if(CollUtil.isEmpty(mallProductNfts)){
return;
}
- DateTime nowTime = DateUtil.parseTime(DateUtil.formatTime(DateUtil.date()));
+ DateTime nowTime = DateUtil.date();
+ DateTime nowTimeFormat = DateUtil.parseTime(DateUtil.formatTime(nowTime));
DataDictionaryCustom endTimeDic = dataDictionaryCustomMapper.selectDicDataByTypeAndCode(
DataDictionaryEnum.YU_YUE_END_TIME.getType(),
DataDictionaryEnum.YU_YUE_END_TIME.getCode()
);
DateTime endTime = DateUtil.parseTime(endTimeDic.getValue());
+ if(nowTimeFormat.compareTo(endTime) < 0){
+ return;
+ }
for(MallProductNft mallProductNft : mallProductNfts){
Long nftId = mallProductNft.getId();
List<MallProductBuy> mallProductBuys = mallProductBuyMapper.selectListByStateAndProductNFTId(
@@ -1097,9 +1119,9 @@
}
for(MallProductBuy mallProductBuy : mallProductBuys){
/**
- * 当前时间比结束时间大
+ * 当前时间比创建时间大
*/
- if(nowTime.compareTo(endTime) >= 0){
+ if(nowTime.compareTo(mallProductBuy.getCreatedTime()) >= 0){
/**
* 返回令牌
* 预约记录超时
@@ -1345,6 +1367,75 @@
}
}
+ @Override
+ public void memberLevelUp() {
+ /**
+ * 获取当前所有的已完成、未转换的买单的用户
+ */
+ QueryWrapper<MallProductBuy> query = new QueryWrapper<>();
+ query.eq("state",ProductEnum.PRODUCT_BUY_SUCCESS.getValue());
+ query.eq("mate_state",ProductEnum.PRODUCT_BUY_MATE_STATE_FAIL.getValue());
+ List<MallProductBuy> mallProductBuys = mallProductBuyMapper.selectList(query);
+ if(CollUtil.isEmpty(mallProductBuys)){
+ return;
+ }
+
+ Set<Long> collect = mallProductBuys.stream().map(MallProductBuy::getMemberId).collect(Collectors.toSet());
+ if(CollUtil.isEmpty(collect)){
+ return;
+ }
+ for(Long memberId : collect){
+ MallMember mallMember = memberMapper.selectById(memberId);
+ if(ObjectUtil.isEmpty(mallMember)){
+ continue;
+ }
+ //上级
+ String referrerId = mallMember.getReferrerId();
+ MallMember mallMemberRef = memberMapper.selectInfoByInviteId(referrerId);
+ List<MallMember> mallMembersAll = memberMapper.selectAllChildAgentListByInviteId(referrerId);
+
+ List<MallMember> mallMembers = memberMapper.selectByRefererId(referrerId);
+ Set<Long> mallMembersSet = mallMembers.stream().map(MallMember::getId).collect(Collectors.toSet());
+ mallMembersSet.retainAll(collect);
+ List<Long> intersection = new ArrayList<>(mallMembersSet);//上级直推有效人数
+ if(CollUtil.isEmpty(intersection)){
+ mallMemberRef.setLevel(MemberLevelNewEnum.ZERO_LEVEL.getType());
+ memberMapper.updateById(mallMemberRef);
+ continue;
+ }
+ /**
+ * 从会员等级最低到最高，比较intersection与会员设置的直推人数directCntLevel比较
+ * directCntLevel >= intersection.size()，则满足升级会员等级条件，跳出循环
+ * teamCnt >= mallMembersAll.size()，则满足升级会员等级条件，跳出循环
+ * 达到最高级别后，升级会员等级，跳出循环
+ */
+ String level = MemberLevelNewEnum.ZERO_LEVEL.getType();
+ boolean flag = false;
+ while (!flag){
+ DataDictionaryCustom levelDic = dataDictionaryCustomMapper.selectDicDataByTypeAndCode(
+ level, level
+ );
+ TeamPerkDto teamPerkDto = JSONObject.parseObject(levelDic.getValue(), TeamPerkDto.class);
+ Integer directCntLevel = teamPerkDto.getDirectCnt();
+ Integer teamCnt = teamPerkDto.getTeamCnt();
+ if(directCntLevel >= intersection.size() &&
+ teamCnt >= mallMembersAll.size()){
+ mallMemberRef.setLevel(level);
+ memberMapper.updateById(mallMemberRef);
+ flag = true;
+ }
+ String nextLevel = MemberLevelNewEnum.ZERO_LEVEL.getNextLevel(level);
+ level = nextLevel;
+ if(level.equals(MemberLevelNewEnum.WU_LEVEL.getType()) &&
+ nextLevel.equals(MemberLevelNewEnum.WU_LEVEL.getType()) ){
+ mallMemberRef.setLevel(level);
+ memberMapper.updateById(mallMemberRef);
+ flag = true;
+ }
+ }
+ }
+ }
+
public void insertSell(Long memberId,BigDecimal nftCnt,BigDecimal nftCntAva,
BigDecimal nftFee,BigDecimal fcmFeeCnt){
String orderNo = MallUtils.getOrderNum("NFT");
@@ -1391,10 +1482,10 @@
}
return list;
}
- public static void main(String[] args) {
- int[] nums = {1, 2, 2, 5, 2};
- List<Integer> missingNumbers = findDisappearedNumbers(nums);
- System.out.println("缺失的数字为：" + missingNumbers);
- }
+// public static void main(String[] args) {
+// int[] nums = {1, 2, 2, 5, 2};
+// List<Integer> missingNumbers = findDisappearedNumbers(nums);
+// System.out.println("缺失的数字为：" + missingNumbers);
+// }
}
--
Gitblit v1.9.1