From d3f2b1d3f3ad2717a7669769aa965127f170ff99 Mon Sep 17 00:00:00 2001
From: xiaoyong931011 <15274802129@163.com>
Date: Mon, 24 Oct 2022 18:15:49 +0800
Subject: [PATCH] 20221021
---
src/main/java/cc/mrbird/febs/dapp/mapper/DappWalletCoinDao.java | 4
src/main/java/cc/mrbird/febs/dapp/service/DappWalletService.java | 11
src/main/java/cc/mrbird/febs/dapp/mapper/IgtOnHookPlanOrderDao.java | 2
src/main/resources/mapper/dapp/IgtOnHookPlanOrderDao.xml | 7
src/main/java/cc/mrbird/febs/dapp/service/impl/DappWalletServiceImpl.java | 286 ++++++++++++++++++++++
src/main/java/cc/mrbird/febs/dapp/service/impl/DappMemberServiceImpl.java | 3
src/test/java/cc/mrbird/febs/JunitTest.java | 236 +++++++++++++-----
src/main/java/cc/mrbird/febs/job/OnHookPlanJob.java | 76 +++++
src/main/java/cc/mrbird/febs/dapp/service/DappMemberService.java | 1
src/main/resources/mapper/dapp/DappMemberDao.xml | 46 +++
src/main/java/cc/mrbird/febs/dapp/enumerate/DataDictionaryEnum.java | 4
src/main/java/cc/mrbird/febs/dapp/mapper/DappMemberDao.java | 8
src/main/java/cc/mrbird/febs/dapp/service/ApiIgtOnHookPlanService.java | 1
src/main/java/cc/mrbird/febs/dapp/service/impl/ApiIgtOnHookPlanServiceImpl.java | 10
src/main/java/cc/mrbird/febs/dapp/entity/DappAccountMoneyChangeEntity.java | 13 +
src/main/resources/mapper/dapp/DappWalletCoinDao.xml | 13 +
16 files changed, 650 insertions(+), 71 deletions(-)
diff --git a/src/main/java/cc/mrbird/febs/dapp/entity/DappAccountMoneyChangeEntity.java b/src/main/java/cc/mrbird/febs/dapp/entity/DappAccountMoneyChangeEntity.java
index 7aa3935..7502df4 100644
--- a/src/main/java/cc/mrbird/febs/dapp/entity/DappAccountMoneyChangeEntity.java
+++ b/src/main/java/cc/mrbird/febs/dapp/entity/DappAccountMoneyChangeEntity.java
@@ -35,6 +35,19 @@
this.setVersion(1);
}
+ public DappAccountMoneyChangeEntity(Long memberId,BigDecimal amount, String content, Integer type) {
+ this.memberId = memberId;
+ this.amount = amount;
+ this.content = content;
+ this.type = type;
+
+ this.setCreateBy("system");
+ this.setUpdateBy("system");
+ this.setCreateTime(new Date());
+ this.setUpdateTime(new Date());
+ this.setVersion(1);
+ }
+
private Long memberId;
private BigDecimal preAmount;
diff --git a/src/main/java/cc/mrbird/febs/dapp/enumerate/DataDictionaryEnum.java b/src/main/java/cc/mrbird/febs/dapp/enumerate/DataDictionaryEnum.java
index c76fb41..a042cfa 100644
--- a/src/main/java/cc/mrbird/febs/dapp/enumerate/DataDictionaryEnum.java
+++ b/src/main/java/cc/mrbird/febs/dapp/enumerate/DataDictionaryEnum.java
@@ -6,12 +6,14 @@
public enum DataDictionaryEnum {
/**
* 资金记录类型
- * 2-提现 4-内部转账 5-挂机收益 6-挂机
+ * 2-提现 4-内部转账 5-挂机收益 6-挂机 7-流水佣金 8-盈利分成
*/
WITHDRAW_OUT("AMOUNT_TYPE","WITHDRAW_OUT"),
WITHDRAW_INSIDE("AMOUNT_TYPE","WITHDRAW_INSIDE"),
ONHOOK_PROFIT("AMOUNT_TYPE","ONHOOK_PROFIT"),
ONHOOK_RECORD("AMOUNT_TYPE","ONHOOK_RECORD"),
+ RUNNING_COMMISION("AMOUNT_TYPE","RUNNING_COMMISION"),
+ PROFIT_SHARING("AMOUNT_TYPE","PROFIT_SHARING"),
/**
* 挂机设置
* 最长挂机时间
diff --git a/src/main/java/cc/mrbird/febs/dapp/mapper/DappMemberDao.java b/src/main/java/cc/mrbird/febs/dapp/mapper/DappMemberDao.java
index 213d673..3254cb9 100644
--- a/src/main/java/cc/mrbird/febs/dapp/mapper/DappMemberDao.java
+++ b/src/main/java/cc/mrbird/febs/dapp/mapper/DappMemberDao.java
@@ -57,4 +57,12 @@
void updateIsOnHook();
IPage<ApiMyTeammateInfoListVo> selectMyTeammateInfoInPage(@Param("record")ApiMyTeammateInfoDto apiMyTeammateInfoDto, Page<ApiMyTeammateInfoListVo> page);
+
+ void updateIdentity();
+
+ List<DappMemberEntity> selectTotalAmountByRefererId(@Param("inviteId")String inviteId);
+
+ void updateIdentityByMemberId(@Param("identity")String code, @Param("id")Long memberEntityId);
+
+ List<DappMemberEntity> selectTotalAmountByRefererIdAndIdentity(@Param("inviteId")String inviteId, @Param("identity")String identity);
}
diff --git a/src/main/java/cc/mrbird/febs/dapp/mapper/DappWalletCoinDao.java b/src/main/java/cc/mrbird/febs/dapp/mapper/DappWalletCoinDao.java
index 0e3399b..928f355 100644
--- a/src/main/java/cc/mrbird/febs/dapp/mapper/DappWalletCoinDao.java
+++ b/src/main/java/cc/mrbird/febs/dapp/mapper/DappWalletCoinDao.java
@@ -1,5 +1,6 @@
package cc.mrbird.febs.dapp.mapper;
+import cc.mrbird.febs.dapp.entity.DappMemberEntity;
import cc.mrbird.febs.dapp.entity.DappWalletCoinEntity;
import com.baomidou.mybatisplus.core.mapper.BaseMapper;
import com.baomidou.mybatisplus.core.metadata.IPage;
@@ -7,6 +8,7 @@
import org.apache.ibatis.annotations.Param;
import java.math.BigDecimal;
+import java.util.List;
public interface DappWalletCoinDao extends BaseMapper<DappWalletCoinEntity> {
@@ -33,4 +35,6 @@
int updateBlockBalance(@Param("id") Long id, @Param("availableBalance") BigDecimal availableBalance, @Param("earlyBalance") BigDecimal earlyBalance, @Param("blockNumber") Integer blockNumber);
int reduceFrozenBalance(@Param("id") Long id, @Param("amount") BigDecimal amount);
+
+ List<DappMemberEntity> selectTotalAmount();
}
diff --git a/src/main/java/cc/mrbird/febs/dapp/mapper/IgtOnHookPlanOrderDao.java b/src/main/java/cc/mrbird/febs/dapp/mapper/IgtOnHookPlanOrderDao.java
index 41c03ca..7364680 100644
--- a/src/main/java/cc/mrbird/febs/dapp/mapper/IgtOnHookPlanOrderDao.java
+++ b/src/main/java/cc/mrbird/febs/dapp/mapper/IgtOnHookPlanOrderDao.java
@@ -18,4 +18,6 @@
Integer AddProfitById(@Param("id")Long id, @Param("profit")BigDecimal balance);
BigDecimal selectSumProfitByMemberId(@Param("memberId")Long memberId);
+
+ List<IgtOnHookPlanOrder> selectByCreateTime(@Param("createTime")String format);
}
diff --git a/src/main/java/cc/mrbird/febs/dapp/service/ApiIgtOnHookPlanService.java b/src/main/java/cc/mrbird/febs/dapp/service/ApiIgtOnHookPlanService.java
index 7261563..a08077b 100644
--- a/src/main/java/cc/mrbird/febs/dapp/service/ApiIgtOnHookPlanService.java
+++ b/src/main/java/cc/mrbird/febs/dapp/service/ApiIgtOnHookPlanService.java
@@ -6,6 +6,7 @@
import com.baomidou.mybatisplus.extension.service.IService;
import java.math.BigDecimal;
+import java.util.List;
public interface ApiIgtOnHookPlanService extends IService<IgtOnHookPlanOrder> {
diff --git a/src/main/java/cc/mrbird/febs/dapp/service/DappMemberService.java b/src/main/java/cc/mrbird/febs/dapp/service/DappMemberService.java
index 95b4a65..68b76c5 100644
--- a/src/main/java/cc/mrbird/febs/dapp/service/DappMemberService.java
+++ b/src/main/java/cc/mrbird/febs/dapp/service/DappMemberService.java
@@ -11,6 +11,7 @@
import com.baomidou.mybatisplus.extension.service.IService;
import java.io.IOException;
+import java.math.BigDecimal;
import java.util.List;
import java.util.Map;
diff --git a/src/main/java/cc/mrbird/febs/dapp/service/DappWalletService.java b/src/main/java/cc/mrbird/febs/dapp/service/DappWalletService.java
index 7cefa0d..00674de 100644
--- a/src/main/java/cc/mrbird/febs/dapp/service/DappWalletService.java
+++ b/src/main/java/cc/mrbird/febs/dapp/service/DappWalletService.java
@@ -60,4 +60,15 @@
FebsResponse rebitTest();
FebsResponse resetPassword(ApiResetPasswordDto apiResetPasswordDto);
+
+ /**
+ * 生成流水佣金和盈利分成和流水记录，返回剩余盈利
+ * @param refererIds
+ */
+ BigDecimal updateLSYJYLFC(List<String> refererIds, BigDecimal totalProfit);
+
+ /**
+ * 平台分成，返回剩余盈利
+ */
+ BigDecimal updatePTFC(Long memberId, BigDecimal totalProfit);
}
diff --git a/src/main/java/cc/mrbird/febs/dapp/service/impl/ApiIgtOnHookPlanServiceImpl.java b/src/main/java/cc/mrbird/febs/dapp/service/impl/ApiIgtOnHookPlanServiceImpl.java
index e7070ed..05124a7 100644
--- a/src/main/java/cc/mrbird/febs/dapp/service/impl/ApiIgtOnHookPlanServiceImpl.java
+++ b/src/main/java/cc/mrbird/febs/dapp/service/impl/ApiIgtOnHookPlanServiceImpl.java
@@ -12,12 +12,14 @@
import cc.mrbird.febs.dapp.enumerate.MemberOnHookPlanEnum;
import cc.mrbird.febs.dapp.mapper.*;
import cc.mrbird.febs.dapp.service.ApiIgtOnHookPlanService;
+import cc.mrbird.febs.dapp.service.DappWalletService;
import cc.mrbird.febs.dapp.vo.ApiAwardInfoVo;
import cc.mrbird.febs.dapp.vo.ApiPlanInfoVo;
import cn.hutool.core.collection.CollUtil;
import cn.hutool.core.date.DateTime;
import cn.hutool.core.date.DateUtil;
import cn.hutool.core.util.ObjectUtil;
+import cn.hutool.core.util.StrUtil;
import cn.hutool.json.JSON;
import cn.hutool.json.JSONObject;
import cn.hutool.json.JSONUtil;
@@ -46,6 +48,7 @@
private final DappAccountMoneyChangeDao dappAccountMoneyChangeDao;
private final RedisUtils redisUtils;
private final DappOnHookAwardDao dappOnHookAwardDao;
+ private final DappWalletService dappWalletService;
@Override
@Transactional(rollbackFor = Exception.class)
public FebsResponse start(ApiStartDto apiStartDto) {
@@ -135,6 +138,7 @@
}
String levelMemberValue = levelMember.getValue();
JSONObject levelMemberValueParse = JSONUtil.parseObj(levelMemberValue);
+ //挂机收益只有总收益的60%
hangingRevenue = new BigDecimal(levelMemberValueParse.get("hangingRevenue").toString())
.multiply(new BigDecimal(0.01)).setScale(4,BigDecimal.ROUND_DOWN);
}
@@ -211,6 +215,12 @@
//计算总收益和总挂机剩余金额，操作用户资金账户信息
//所有中奖的收益
BigDecimal totalProfit = igtOnHookPlanOrderItemDao.selectTotalProfitByByOrderIdAndMemberIdAndState(orderId,memberId,1,2);
+ String refererIds = dappMemberDao.selectById(memberId).getRefererIds();
+ List<String> refererIdList = StrUtil.split(refererIds, ",", -1, true, true);
+ //生成流水佣金和盈利分成和流水记录，返回剩余盈利
+ totalProfit = dappWalletService.updateLSYJYLFC(refererIdList,totalProfit);
+ //平台分成，返回剩余盈利
+ totalProfit = dappWalletService.updatePTFC(memberId,totalProfit);
//所有未中奖的本金
BigDecimal totalAmount = igtOnHookPlanOrderItemDao.selectTotalAmountByByOrderIdAndMemberIdAndState(orderId,memberId,1,1);
DappWalletCoinEntity dappWalletCoinEntity = dappWalletCoinDao.selectByMemberId(memberId);
diff --git a/src/main/java/cc/mrbird/febs/dapp/service/impl/DappMemberServiceImpl.java b/src/main/java/cc/mrbird/febs/dapp/service/impl/DappMemberServiceImpl.java
index c4010fc..9bbff4b 100644
--- a/src/main/java/cc/mrbird/febs/dapp/service/impl/DappMemberServiceImpl.java
+++ b/src/main/java/cc/mrbird/febs/dapp/service/impl/DappMemberServiceImpl.java
@@ -28,6 +28,7 @@
import cn.hutool.crypto.SecureUtil;
import cn.hutool.crypto.asymmetric.KeyType;
import cn.hutool.crypto.asymmetric.RSA;
+import cn.hutool.json.JSONUtil;
import com.alibaba.fastjson.JSONObject;
import com.baomidou.mybatisplus.core.metadata.IPage;
import com.baomidou.mybatisplus.extension.plugins.pagination.Page;
@@ -925,4 +926,6 @@
RSA rsa = new RSA(null, AppContants.PUBLIC_KEY);
return rsa.encryptBase64(token + "_" + System.currentTimeMillis(), KeyType.PublicKey);
}
+
+
}
diff --git a/src/main/java/cc/mrbird/febs/dapp/service/impl/DappWalletServiceImpl.java b/src/main/java/cc/mrbird/febs/dapp/service/impl/DappWalletServiceImpl.java
index 439afd5..6758233 100644
--- a/src/main/java/cc/mrbird/febs/dapp/service/impl/DappWalletServiceImpl.java
+++ b/src/main/java/cc/mrbird/febs/dapp/service/impl/DappWalletServiceImpl.java
@@ -29,6 +29,7 @@
import cn.hutool.core.date.DateUtil;
import cn.hutool.core.util.ObjectUtil;
import cn.hutool.crypto.SecureUtil;
+import cn.hutool.json.JSONUtil;
import com.baomidou.mybatisplus.core.conditions.Wrapper;
import com.baomidou.mybatisplus.core.conditions.query.QueryWrapper;
import com.baomidou.mybatisplus.core.conditions.update.UpdateWrapper;
@@ -856,5 +857,290 @@
return new FebsResponse().success().message(MessageSourceUtils.getString("Operation_001"));
}
+ @Override
+ public BigDecimal updateLSYJYLFC(List<String> refererIdList,BigDecimal totalProfit) {
+ //计算盈利分成
+// if(CollUtil.isNotEmpty(refererIdList)){
+// String LEVEL_IB = isIdentity(refererIdList, DataDictionaryEnum.LEVEL_IB.getCode());
+// if(!DataDictionaryEnum.LEVEL_IB.getCode().equals(LEVEL_IB)){
+// BigDecimal multiply = totalProfit.multiply(getProfitSharing(DataDictionaryEnum.LEVEL_IB.getCode()));
+// DappMemberEntity dappMemberEntityLEVEL_IB = dappMemberDao.selectMemberInfoByInviteId(LEVEL_IB);
+//
+// dappWalletCoinDao.addTotalAndaddAvailableById(dappMemberEntityLEVEL_IB.getId(),multiply);
+// DappAccountMoneyChangeEntity dappAccountMoneyChangeEntity = new DappAccountMoneyChangeEntity(
+// dappMemberEntityLEVEL_IB.getId(), multiply, "盈利分成", 8);
+// dappAccountMoneyChangeDao.insert(dappAccountMoneyChangeEntity);
+// totalProfit = totalProfit.subtract(multiply);
+// }
+// String LEVEL_FIB = isIdentity(refererIdList, DataDictionaryEnum.LEVEL_FIB.getCode());
+// if(!DataDictionaryEnum.LEVEL_FIB.getCode().equals(LEVEL_FIB)){
+// BigDecimal multiply = BigDecimal.ZERO;
+// if(!DataDictionaryEnum.LEVEL_IB.getCode().equals(LEVEL_IB)){
+// multiply = getProfitSharing(DataDictionaryEnum.LEVEL_FIB.getCode()).subtract(getProfitSharing(DataDictionaryEnum.LEVEL_IB.getCode()));
+// }else{
+// multiply = totalProfit.multiply(getProfitSharing(DataDictionaryEnum.LEVEL_FIB.getCode()));
+// }
+// DappMemberEntity dappMemberEntityLEVEL_FIB = dappMemberDao.selectMemberInfoByInviteId(LEVEL_FIB);
+//
+// dappWalletCoinDao.addTotalAndaddAvailableById(dappMemberEntityLEVEL_FIB.getId(),multiply);
+// DappAccountMoneyChangeEntity dappAccountMoneyChangeEntity = new DappAccountMoneyChangeEntity(
+// dappMemberEntityLEVEL_FIB.getId(), multiply, "盈利分成", 8);
+// dappAccountMoneyChangeDao.insert(dappAccountMoneyChangeEntity);
+// totalProfit = totalProfit.subtract(multiply);
+// }
+// String LEVEL_CIB = isIdentity(refererIdList, DataDictionaryEnum.LEVEL_CIB.getCode());
+// if(!DataDictionaryEnum.LEVEL_CIB.getCode().equals(LEVEL_CIB)){
+// BigDecimal multiply = BigDecimal.ZERO;
+// if(!DataDictionaryEnum.LEVEL_IB.getCode().equals(LEVEL_IB)){
+// multiply = getProfitSharing(DataDictionaryEnum.LEVEL_CIB.getCode()).subtract(getProfitSharing(DataDictionaryEnum.LEVEL_IB.getCode()));
+// }
+// if(!DataDictionaryEnum.LEVEL_FIB.getCode().equals(LEVEL_FIB)){
+// multiply = getProfitSharing(DataDictionaryEnum.LEVEL_CIB.getCode()).subtract(getProfitSharing(DataDictionaryEnum.LEVEL_FIB.getCode()));
+// }
+// multiply = totalProfit.multiply(multiply);
+// DappMemberEntity dappMemberEntityLEVEL_CIB = dappMemberDao.selectMemberInfoByInviteId(LEVEL_CIB);
+// dappWalletCoinDao.addTotalAndaddAvailableById(dappMemberEntityLEVEL_CIB.getId(),multiply);
+// DappAccountMoneyChangeEntity dappAccountMoneyChangeEntity = new DappAccountMoneyChangeEntity(
+// dappMemberEntityLEVEL_CIB.getId(), multiply, "盈利分成", 8);
+// dappAccountMoneyChangeDao.insert(dappAccountMoneyChangeEntity);
+// totalProfit = totalProfit.subtract(multiply);
+// }
+// String LEVEL_AIB = isIdentity(refererIdList, DataDictionaryEnum.LEVEL_AIB.getCode());
+// if(!DataDictionaryEnum.LEVEL_AIB.getCode().equals(LEVEL_AIB)){
+// BigDecimal multiply = BigDecimal.ZERO;
+// if(!DataDictionaryEnum.LEVEL_IB.getCode().equals(LEVEL_IB)){
+// multiply = getProfitSharing(DataDictionaryEnum.LEVEL_CIB.getCode()).subtract(getProfitSharing(DataDictionaryEnum.LEVEL_IB.getCode()));
+// }
+// if(!DataDictionaryEnum.LEVEL_FIB.getCode().equals(LEVEL_FIB)){
+// multiply = getProfitSharing(DataDictionaryEnum.LEVEL_CIB.getCode()).subtract(getProfitSharing(DataDictionaryEnum.LEVEL_FIB.getCode()));
+// }
+// if(!DataDictionaryEnum.LEVEL_CIB.getCode().equals(LEVEL_CIB)){
+// multiply = getProfitSharing(DataDictionaryEnum.LEVEL_AIB.getCode()).subtract(getProfitSharing(DataDictionaryEnum.LEVEL_CIB.getCode()));
+// }
+// multiply = totalProfit.multiply(multiply);
+// DappMemberEntity dappMemberEntityLEVEL_AIB = dappMemberDao.selectMemberInfoByInviteId(LEVEL_AIB);
+// dappWalletCoinDao.addTotalAndaddAvailableById(dappMemberEntityLEVEL_AIB.getId(),multiply);
+// DappAccountMoneyChangeEntity dappAccountMoneyChangeEntity = new DappAccountMoneyChangeEntity(
+// dappMemberEntityLEVEL_AIB.getId(), multiply, "盈利分成", 8);
+// dappAccountMoneyChangeDao.insert(dappAccountMoneyChangeEntity);
+// totalProfit = totalProfit.subtract(multiply);
+// }
+// String LEVEL_GIB = isIdentity(refererIdList, DataDictionaryEnum.LEVEL_GIB.getCode());
+// if(!DataDictionaryEnum.LEVEL_GIB.getCode().equals(LEVEL_GIB)){
+// BigDecimal multiply = BigDecimal.ZERO;
+// if(!DataDictionaryEnum.LEVEL_IB.getCode().equals(LEVEL_IB)){
+// multiply = getProfitSharing(DataDictionaryEnum.LEVEL_CIB.getCode()).subtract(getProfitSharing(DataDictionaryEnum.LEVEL_IB.getCode()));
+// }
+// if(!DataDictionaryEnum.LEVEL_FIB.getCode().equals(LEVEL_FIB)){
+// multiply = getProfitSharing(DataDictionaryEnum.LEVEL_CIB.getCode()).subtract(getProfitSharing(DataDictionaryEnum.LEVEL_FIB.getCode()));
+// }
+// if(!DataDictionaryEnum.LEVEL_CIB.getCode().equals(LEVEL_CIB)){
+// multiply = getProfitSharing(DataDictionaryEnum.LEVEL_AIB.getCode()).subtract(getProfitSharing(DataDictionaryEnum.LEVEL_CIB.getCode()));
+// }
+// if(!DataDictionaryEnum.LEVEL_AIB.getCode().equals(LEVEL_AIB)){
+// multiply = getProfitSharing(DataDictionaryEnum.LEVEL_GIB.getCode()).subtract(getProfitSharing(DataDictionaryEnum.LEVEL_AIB.getCode()));
+// }
+// multiply = totalProfit.multiply(multiply);
+// DappMemberEntity dappMemberEntityLEVEL_GIB = dappMemberDao.selectMemberInfoByInviteId(LEVEL_GIB);
+// dappWalletCoinDao.addTotalAndaddAvailableById(dappMemberEntityLEVEL_GIB.getId(),multiply);
+// DappAccountMoneyChangeEntity dappAccountMoneyChangeEntity = new DappAccountMoneyChangeEntity(
+// dappMemberEntityLEVEL_GIB.getId(), multiply, "盈利分成", 8);
+// dappAccountMoneyChangeDao.insert(dappAccountMoneyChangeEntity);
+// totalProfit = totalProfit.subtract(multiply);
+// }
+// String LEVEL_BP = isIdentity(refererIdList, DataDictionaryEnum.LEVEL_BP.getCode());
+// if(!DataDictionaryEnum.LEVEL_BP.getCode().equals(LEVEL_BP)){
+// BigDecimal multiply = BigDecimal.ZERO;
+// if(!DataDictionaryEnum.LEVEL_IB.getCode().equals(LEVEL_IB)){
+// multiply = getProfitSharing(DataDictionaryEnum.LEVEL_CIB.getCode()).subtract(getProfitSharing(DataDictionaryEnum.LEVEL_IB.getCode()));
+// }
+// if(!DataDictionaryEnum.LEVEL_FIB.getCode().equals(LEVEL_FIB)){
+// multiply = getProfitSharing(DataDictionaryEnum.LEVEL_CIB.getCode()).subtract(getProfitSharing(DataDictionaryEnum.LEVEL_FIB.getCode()));
+// }
+// if(!DataDictionaryEnum.LEVEL_CIB.getCode().equals(LEVEL_CIB)){
+// multiply = getProfitSharing(DataDictionaryEnum.LEVEL_AIB.getCode()).subtract(getProfitSharing(DataDictionaryEnum.LEVEL_CIB.getCode()));
+// }
+// if(!DataDictionaryEnum.LEVEL_AIB.getCode().equals(LEVEL_AIB)){
+// multiply = getProfitSharing(DataDictionaryEnum.LEVEL_GIB.getCode()).subtract(getProfitSharing(DataDictionaryEnum.LEVEL_AIB.getCode()));
+// }
+// if(!DataDictionaryEnum.LEVEL_GIB.getCode().equals(LEVEL_GIB)){
+// multiply = getProfitSharing(DataDictionaryEnum.LEVEL_BP.getCode()).subtract(getProfitSharing(DataDictionaryEnum.LEVEL_GIB.getCode()));
+// }
+// multiply = totalProfit.multiply(multiply);
+// DappMemberEntity dappMemberEntityLEVEL_BP = dappMemberDao.selectMemberInfoByInviteId(LEVEL_BP);
+// dappWalletCoinDao.addTotalAndaddAvailableById(dappMemberEntityLEVEL_BP.getId(),multiply);
+// DappAccountMoneyChangeEntity dappAccountMoneyChangeEntity = new DappAccountMoneyChangeEntity(
+// dappMemberEntityLEVEL_BP.getId(), multiply, "盈利分成", 8);
+// dappAccountMoneyChangeDao.insert(dappAccountMoneyChangeEntity);
+// totalProfit = totalProfit.subtract(multiply);
+// }
+// String LEVEL_SP = isIdentity(refererIdList, DataDictionaryEnum.LEVEL_SP.getCode());
+// if(!DataDictionaryEnum.LEVEL_SP.getCode().equals(LEVEL_SP)){
+// BigDecimal multiply = BigDecimal.ZERO;
+// if(!DataDictionaryEnum.LEVEL_IB.getCode().equals(LEVEL_IB)){
+// multiply = getProfitSharing(DataDictionaryEnum.LEVEL_CIB.getCode()).subtract(getProfitSharing(DataDictionaryEnum.LEVEL_IB.getCode()));
+// }
+// if(!DataDictionaryEnum.LEVEL_FIB.getCode().equals(LEVEL_FIB)){
+// multiply = getProfitSharing(DataDictionaryEnum.LEVEL_CIB.getCode()).subtract(getProfitSharing(DataDictionaryEnum.LEVEL_FIB.getCode()));
+// }
+// if(!DataDictionaryEnum.LEVEL_CIB.getCode().equals(LEVEL_CIB)){
+// multiply = getProfitSharing(DataDictionaryEnum.LEVEL_AIB.getCode()).subtract(getProfitSharing(DataDictionaryEnum.LEVEL_CIB.getCode()));
+// }
+// if(!DataDictionaryEnum.LEVEL_AIB.getCode().equals(LEVEL_AIB)){
+// multiply = getProfitSharing(DataDictionaryEnum.LEVEL_GIB.getCode()).subtract(getProfitSharing(DataDictionaryEnum.LEVEL_AIB.getCode()));
+// }
+// if(!DataDictionaryEnum.LEVEL_GIB.getCode().equals(LEVEL_GIB)){
+// multiply = getProfitSharing(DataDictionaryEnum.LEVEL_BP.getCode()).subtract(getProfitSharing(DataDictionaryEnum.LEVEL_GIB.getCode()));
+// }
+// if(!DataDictionaryEnum.LEVEL_BP.getCode().equals(LEVEL_BP)){
+// multiply = getProfitSharing(DataDictionaryEnum.LEVEL_SP.getCode()).subtract(getProfitSharing(DataDictionaryEnum.LEVEL_BP.getCode()));
+// }
+// multiply = totalProfit.multiply(multiply);
+// DappMemberEntity dappMemberEntityLEVEL_SP = dappMemberDao.selectMemberInfoByInviteId(LEVEL_SP);
+// dappWalletCoinDao.addTotalAndaddAvailableById(dappMemberEntityLEVEL_SP.getId(),multiply);
+// DappAccountMoneyChangeEntity dappAccountMoneyChangeEntity = new DappAccountMoneyChangeEntity(
+// dappMemberEntityLEVEL_SP.getId(), multiply, "盈利分成", 8);
+// dappAccountMoneyChangeDao.insert(dappAccountMoneyChangeEntity);
+// totalProfit = totalProfit.subtract(multiply);
+// }
+// String LEVEL_GP = isIdentity(refererIdList, DataDictionaryEnum.LEVEL_GP.getCode());
+// if(!DataDictionaryEnum.LEVEL_GP.getCode().equals(LEVEL_GP)){
+// BigDecimal multiply = BigDecimal.ZERO;
+// if(!DataDictionaryEnum.LEVEL_IB.getCode().equals(LEVEL_IB)){
+// multiply = getProfitSharing(DataDictionaryEnum.LEVEL_CIB.getCode()).subtract(getProfitSharing(DataDictionaryEnum.LEVEL_IB.getCode()));
+// }
+// if(!DataDictionaryEnum.LEVEL_FIB.getCode().equals(LEVEL_FIB)){
+// multiply = getProfitSharing(DataDictionaryEnum.LEVEL_CIB.getCode()).subtract(getProfitSharing(DataDictionaryEnum.LEVEL_FIB.getCode()));
+// }
+// if(!DataDictionaryEnum.LEVEL_CIB.getCode().equals(LEVEL_CIB)){
+// multiply = getProfitSharing(DataDictionaryEnum.LEVEL_AIB.getCode()).subtract(getProfitSharing(DataDictionaryEnum.LEVEL_CIB.getCode()));
+// }
+// if(!DataDictionaryEnum.LEVEL_AIB.getCode().equals(LEVEL_AIB)){
+// multiply = getProfitSharing(DataDictionaryEnum.LEVEL_GIB.getCode()).subtract(getProfitSharing(DataDictionaryEnum.LEVEL_AIB.getCode()));
+// }
+// if(!DataDictionaryEnum.LEVEL_GIB.getCode().equals(LEVEL_GIB)){
+// multiply = getProfitSharing(DataDictionaryEnum.LEVEL_BP.getCode()).subtract(getProfitSharing(DataDictionaryEnum.LEVEL_GIB.getCode()));
+// }
+// if(!DataDictionaryEnum.LEVEL_BP.getCode().equals(LEVEL_BP)){
+// multiply = getProfitSharing(DataDictionaryEnum.LEVEL_SP.getCode()).subtract(getProfitSharing(DataDictionaryEnum.LEVEL_BP.getCode()));
+// }
+// if(!DataDictionaryEnum.LEVEL_SP.getCode().equals(LEVEL_SP)){
+// multiply = getProfitSharing(DataDictionaryEnum.LEVEL_GP.getCode()).subtract(getProfitSharing(DataDictionaryEnum.LEVEL_SP.getCode()));
+// }
+// multiply = totalProfit.multiply(multiply);
+// DappMemberEntity dappMemberEntityLEVEL_GP = dappMemberDao.selectMemberInfoByInviteId(LEVEL_GP);
+// dappWalletCoinDao.addTotalAndaddAvailableById(dappMemberEntityLEVEL_GP.getId(),multiply);
+// DappAccountMoneyChangeEntity dappAccountMoneyChangeEntity = new DappAccountMoneyChangeEntity(
+// dappMemberEntityLEVEL_GP.getId(), multiply, "盈利分成", 8);
+// dappAccountMoneyChangeDao.insert(dappAccountMoneyChangeEntity);
+// totalProfit = totalProfit.subtract(multiply);
+// }
+//
+//
+// }
+ //计算流水佣金
+ if(CollUtil.isNotEmpty(refererIdList)){
+ String LEVEL_AIB = isIdentity(refererIdList, DataDictionaryEnum.LEVEL_AIB.getCode());
+ if(!DataDictionaryEnum.LEVEL_AIB.getCode().equals(LEVEL_AIB)){
+ BigDecimal multiply = totalProfit.multiply(getRunningCommission(DataDictionaryEnum.LEVEL_AIB.getCode()));
+ DappMemberEntity dappMemberEntityLEVEL_AIB = dappMemberDao.selectMemberInfoByInviteId(LEVEL_AIB);
+
+ dappWalletCoinDao.addTotalAndaddAvailableById(dappMemberEntityLEVEL_AIB.getId(),multiply);
+ DappAccountMoneyChangeEntity dappAccountMoneyChangeEntity = new DappAccountMoneyChangeEntity(
+ dappMemberEntityLEVEL_AIB.getId(), multiply, "流水佣金", 7);
+ dappAccountMoneyChangeDao.insert(dappAccountMoneyChangeEntity);
+ totalProfit = totalProfit.subtract(multiply);
+ }
+
+ String LEVEL_GIB = isIdentity(refererIdList, DataDictionaryEnum.LEVEL_GIB.getCode());
+ if(!DataDictionaryEnum.LEVEL_GIB.getCode().equals(LEVEL_GIB)){
+ BigDecimal multiply = totalProfit.multiply(getRunningCommission(DataDictionaryEnum.LEVEL_GIB.getCode()));
+ DappMemberEntity dappMemberEntityLEVEL_GIB = dappMemberDao.selectMemberInfoByInviteId(LEVEL_GIB);
+
+ dappWalletCoinDao.addTotalAndaddAvailableById(dappMemberEntityLEVEL_GIB.getId(),multiply);
+ DappAccountMoneyChangeEntity dappAccountMoneyChangeEntity = new DappAccountMoneyChangeEntity(
+ dappMemberEntityLEVEL_GIB.getId(), multiply, "流水佣金", 7);
+ dappAccountMoneyChangeDao.insert(dappAccountMoneyChangeEntity);
+ totalProfit = totalProfit.subtract(multiply);
+ }
+
+ String LEVEL_BP = isIdentity(refererIdList, DataDictionaryEnum.LEVEL_BP.getCode());
+ if(!DataDictionaryEnum.LEVEL_BP.getCode().equals(LEVEL_BP)){
+ BigDecimal multiply = totalProfit.multiply(getRunningCommission(DataDictionaryEnum.LEVEL_BP.getCode()));
+ DappMemberEntity dappMemberEntityLEVEL_BP = dappMemberDao.selectMemberInfoByInviteId(LEVEL_BP);
+
+ dappWalletCoinDao.addTotalAndaddAvailableById(dappMemberEntityLEVEL_BP.getId(),multiply);
+ DappAccountMoneyChangeEntity dappAccountMoneyChangeEntity = new DappAccountMoneyChangeEntity(
+ dappMemberEntityLEVEL_BP.getId(), multiply, "流水佣金", 7);
+ dappAccountMoneyChangeDao.insert(dappAccountMoneyChangeEntity);
+ totalProfit = totalProfit.subtract(multiply);
+ }
+
+ String LEVEL_SP = isIdentity(refererIdList, DataDictionaryEnum.LEVEL_SP.getCode());
+ if(!DataDictionaryEnum.LEVEL_SP.getCode().equals(LEVEL_SP)){
+ BigDecimal multiply = totalProfit.multiply(getRunningCommission(DataDictionaryEnum.LEVEL_SP.getCode()));
+ DappMemberEntity dappMemberEntityLEVEL_SP = dappMemberDao.selectMemberInfoByInviteId(LEVEL_SP);
+
+ dappWalletCoinDao.addTotalAndaddAvailableById(dappMemberEntityLEVEL_SP.getId(),multiply);
+ DappAccountMoneyChangeEntity dappAccountMoneyChangeEntity = new DappAccountMoneyChangeEntity(
+ dappMemberEntityLEVEL_SP.getId(), multiply, "流水佣金", 7);
+ dappAccountMoneyChangeDao.insert(dappAccountMoneyChangeEntity);
+ totalProfit = totalProfit.subtract(multiply);
+ }
+
+ String LEVEL_GP = isIdentity(refererIdList, DataDictionaryEnum.LEVEL_GP.getCode());
+ if(!DataDictionaryEnum.LEVEL_GP.getCode().equals(LEVEL_GP)){
+ BigDecimal multiply = totalProfit.multiply(getRunningCommission(DataDictionaryEnum.LEVEL_GP.getCode()));
+ DappMemberEntity dappMemberEntityLEVEL_GP = dappMemberDao.selectMemberInfoByInviteId(LEVEL_GP);
+
+ dappWalletCoinDao.addTotalAndaddAvailableById(dappMemberEntityLEVEL_GP.getId(),multiply);
+ DappAccountMoneyChangeEntity dappAccountMoneyChangeEntity = new DappAccountMoneyChangeEntity(
+ dappMemberEntityLEVEL_GP.getId(), multiply, "流水佣金", 7);
+ dappAccountMoneyChangeDao.insert(dappAccountMoneyChangeEntity);
+ totalProfit = totalProfit.subtract(multiply);
+ }
+ }
+ return totalProfit;
+ }
+
+ @Override
+ public BigDecimal updatePTFC(Long memberId, BigDecimal totalProfit) {
+ BigDecimal multiply = totalProfit.multiply(new BigDecimal(0.05));
+ DappAccountMoneyChangeEntity dappAccountMoneyChangeEntity = new DappAccountMoneyChangeEntity(
+ memberId, multiply, "系统", 9);
+ dappAccountMoneyChangeDao.insert(dappAccountMoneyChangeEntity);
+ totalProfit = totalProfit.subtract(multiply);
+ return totalProfit;
+ }
+
+ private String isIdentity(List<String> refererIds,String levelCode){
+ String flag = levelCode;
+ for(String str : refererIds){
+ DappMemberEntity dappMemberEntity = dappMemberDao.selectMemberInfoByInviteId(str);
+ if(ObjectUtil.isNotEmpty(dappMemberEntity)){
+ String identity = dappMemberEntity.getIdentity();
+ if(levelCode.equals(identity)){
+ flag = str;
+ }
+ }
+ }
+ return flag;
+ }
+
+ private BigDecimal getRunningCommission(String identity){
+ DataDictionaryCustom dataDictionaryCustom = dataDictionaryCustomMapper.selectDicDataByTypeAndCode(DataDictionaryEnum.LEVEL_MB.getType(), identity);
+ String dataDictionaryCustomValue = dataDictionaryCustom.getValue();
+ cn.hutool.json.JSONObject jsonObject = JSONUtil.parseObj(dataDictionaryCustomValue);
+ String runningCommission = jsonObject.get("runningCommission").toString();
+ return new BigDecimal(runningCommission).multiply(new BigDecimal(0.01));
+ }
+
+ private BigDecimal getProfitSharing(String identity){
+ DataDictionaryCustom dataDictionaryCustom = dataDictionaryCustomMapper.selectDicDataByTypeAndCode(DataDictionaryEnum.LEVEL_MB.getType(), identity);
+ String dataDictionaryCustomValue = dataDictionaryCustom.getValue();
+ cn.hutool.json.JSONObject jsonObject = JSONUtil.parseObj(dataDictionaryCustomValue);
+ String profitSharing = jsonObject.get("profitSharing").toString();
+ return new BigDecimal(profitSharing).multiply(new BigDecimal(0.01));
+ }
}
diff --git a/src/main/java/cc/mrbird/febs/job/OnHookPlanJob.java b/src/main/java/cc/mrbird/febs/job/OnHookPlanJob.java
index cbd8c16..a5aa65a 100644
--- a/src/main/java/cc/mrbird/febs/job/OnHookPlanJob.java
+++ b/src/main/java/cc/mrbird/febs/job/OnHookPlanJob.java
@@ -2,15 +2,20 @@
import cc.mrbird.febs.common.utils.RedisUtils;
import cc.mrbird.febs.dapp.entity.*;
+import cc.mrbird.febs.dapp.enumerate.DataDictionaryEnum;
import cc.mrbird.febs.dapp.mapper.*;
+import cc.mrbird.febs.dapp.service.DappWalletService;
import cn.hutool.core.collection.CollUtil;
import cn.hutool.core.date.DateTime;
import cn.hutool.core.date.DateUtil;
import cn.hutool.core.util.ObjectUtil;
import cn.hutool.core.util.RandomUtil;
import cn.hutool.core.util.StrUtil;
+import cn.hutool.json.JSONObject;
+import cn.hutool.json.JSONUtil;
import com.baomidou.mybatisplus.core.conditions.query.QueryWrapper;
import lombok.extern.slf4j.Slf4j;
+import org.apache.commons.lang3.StringUtils;
import org.jline.utils.Log;
import org.springframework.beans.factory.annotation.Autowired;
import org.springframework.scheduling.annotation.Scheduled;
@@ -20,7 +25,7 @@
import java.text.DecimalFormat;
import java.text.Format;
import java.text.SimpleDateFormat;
-import java.util.List;
+import java.util.*;
@Slf4j
@Component
@@ -46,6 +51,12 @@
@Autowired
private RedisUtils redisUtils;
+
+ @Autowired
+ private DataDictionaryCustomMapper dataDictionaryCustomMapper;
+
+ @Autowired
+ private DappWalletService dappWalletService;
/**
* 五分钟更新一次数据
@@ -115,6 +126,15 @@
IgtOnHookPlanOrderItem igtOnHookPlanOrderItem = igtOnHookPlanOrderItemDao.selectByOrderIdAndMemberIdAndState(orderId,memberId,2);
if(ObjectUtil.isEmpty(igtOnHookPlanOrderItem)){
BigDecimal totalProfit = igtOnHookPlanOrderItemDao.selectTotalProfitByByOrderIdAndMemberIdAndState(orderId,memberId,1,2);
+
+ DappMemberEntity dappMemberEntity = dappMemberDao.selectById(memberId);
+ String refererIds = dappMemberEntity.getRefererIds();
+ List<String> refererIdList = StrUtil.split(refererIds, ",", -1, true, true);
+ //生成流水佣金和盈利分成和流水记录，返回剩余盈利
+ totalProfit = dappWalletService.updateLSYJYLFC(refererIdList,totalProfit);
+ //平台分成，返回剩余盈利
+ totalProfit = dappWalletService.updatePTFC(memberId,totalProfit);
+
BigDecimal totalAmount = igtOnHookPlanOrderItemDao.selectTotalAmountByByOrderIdAndMemberIdAndState(orderId,memberId,1,1);
igtOnHookPlanOrder.setState(2);
//一次挂机剩余的全部金额
@@ -125,8 +145,6 @@
igtOnHookPlanOrder.setProfitState(1);
}
igtOnHookPlanOrderDao.updateById(igtOnHookPlanOrder);
-
- DappMemberEntity dappMemberEntity = dappMemberDao.selectById(memberId);
dappMemberEntity.setIsOnHook(3);
dappMemberDao.updateById(dappMemberEntity);
@@ -145,6 +163,8 @@
}
}
+
+
@Scheduled(cron = "0 0/1 * * * ? ")
public void updateMemberIsOnHook(){
@@ -211,6 +231,56 @@
}
+ /**
+ * 更新用户等级的条件
+ * 一天跑一次，跑完之后进行分佣，和盈利分成
+ * 1、三个有效的用户等级用户
+ * 2、账户余额大于51
+ */
+ @Scheduled(cron = "0 0 1 * * ? ")
+ public void updateMemberLevel(){
+ Log.info("更新用户代理等级");
+ DateTime date = DateUtil.date();
+ //查询账户总金额大于51的有效用户
+ 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());
+ }
+ }
+
+ private List<DappMemberEntity> getMemberLevelList(List<DappMemberEntity> dappMemberEntities,String identity,String identityNext){
+ List<DappMemberEntity> dappMemberEntitiesNext = new ArrayList<>();
+ if(CollUtil.isNotEmpty(dappMemberEntities)){
+ for(DappMemberEntity dappMemberEntity : dappMemberEntities){
+ 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()){
+ //设置identityNext级别
+ dappMemberDao.updateIdentityByMemberId(identityNext,memberEntityId);
+ //获取他的上级会员信息
+ DappMemberEntity dappMemberEntityNext = dappMemberDao.selectMemberInfoByInviteId(refererId);
+ dappMemberEntitiesNext.add(dappMemberEntityNext);
+ }
+ }
+ }
+ return dappMemberEntitiesNext;
+ }
+
+
+
public static void main(String[] args) {
DateTime date = DateUtil.date();
diff --git a/src/main/resources/mapper/dapp/DappMemberDao.xml b/src/main/resources/mapper/dapp/DappMemberDao.xml
index 6f51c25..6ce2b90 100644
--- a/src/main/resources/mapper/dapp/DappMemberDao.xml
+++ b/src/main/resources/mapper/dapp/DappMemberDao.xml
@@ -184,4 +184,50 @@
where a.referer_id=#{record.inviteId}
order by a.create_time desc
</select>
+
+ <update id="updateIdentity">
+ update dapp_member
+ set
+ identity = 'LEVEL_MB'
+ </update>
+
+ <select id="selectTotalAmountByRefererId" resultType="cc.mrbird.febs.dapp.entity.DappMemberEntity">
+ select
+ b.id,
+ b.invite_id,
+ b.referer_id,
+ b.identity,
+ b.referer_ids
+ from
+ member_wallet_coin a
+ inner join dapp_member b on a.member_id = b.id
+ where
+ a.total_amount <![CDATA[ >= ]]> 51
+ and b.referer_id = #{inviteId}
+
+ </select>
+
+ <update id="updateIdentityByMemberId">
+ update dapp_member
+ set
+ identity = #{identity}
+ where id = #{id}
+ </update>
+
+ <select id="selectTotalAmountByRefererIdAndIdentity" resultType="cc.mrbird.febs.dapp.entity.DappMemberEntity">
+ select
+ b.id,
+ b.invite_id,
+ b.referer_id,
+ b.identity,
+ b.referer_ids
+ from
+ dapp_wallet_coin a
+ inner join dapp_member b on a.member_id = b.id
+ where
+ a.total_amount <![CDATA[ >= ]]> 51
+ and b.referer_id = #{inviteId}
+ and b.identity = #{identity}
+
+ </select>
</mapper>
\ No newline at end of file
diff --git a/src/main/resources/mapper/dapp/DappWalletCoinDao.xml b/src/main/resources/mapper/dapp/DappWalletCoinDao.xml
index b3fe6f7..2b0a088 100644
--- a/src/main/resources/mapper/dapp/DappWalletCoinDao.xml
+++ b/src/main/resources/mapper/dapp/DappWalletCoinDao.xml
@@ -109,4 +109,17 @@
total_balance = total_balance - #{amount}
where id=#{id}
</update>
+
+ <select id="selectTotalAmount" resultType="cc.mrbird.febs.dapp.entity.DappMemberEntity">
+ select
+ b.id,
+ b.invite_id,
+ b.referer_id,
+ b.identity,
+ b.referer_ids
+ from
+ dapp_wallet_coin a
+ inner join dapp_member b on a.member_id = b.id
+ where a.total_amount <![CDATA[ >= ]]> 51
+ </select>
</mapper>
\ No newline at end of file
diff --git a/src/main/resources/mapper/dapp/IgtOnHookPlanOrderDao.xml b/src/main/resources/mapper/dapp/IgtOnHookPlanOrderDao.xml
index 43648e1..c41cb6f 100644
--- a/src/main/resources/mapper/dapp/IgtOnHookPlanOrderDao.xml
+++ b/src/main/resources/mapper/dapp/IgtOnHookPlanOrderDao.xml
@@ -43,4 +43,11 @@
where a.member_id = #{memberId}
</select>
+ <select id="selectByCreateTime" resultType="cc.mrbird.febs.dapp.entity.IgtOnHookPlanOrder">
+ SELECT
+ a.*
+ FROM igt_on_hook_plan_order a
+ where and date_format(a.create_time, '%Y-%m-%d') = #{createTime}
+ </select>
+
</mapper>
\ No newline at end of file
diff --git a/src/test/java/cc/mrbird/febs/JunitTest.java b/src/test/java/cc/mrbird/febs/JunitTest.java
index 0958fac..c05401d 100644
--- a/src/test/java/cc/mrbird/febs/JunitTest.java
+++ b/src/test/java/cc/mrbird/febs/JunitTest.java
@@ -4,18 +4,15 @@
import cc.mrbird.febs.common.contants.AppContants;
import cc.mrbird.febs.common.exception.FebsException;
import cc.mrbird.febs.common.utils.RedisUtils;
-import cc.mrbird.febs.dapp.entity.DappMemberEntity;
-import cc.mrbird.febs.dapp.entity.DappOnHookAward;
-import cc.mrbird.febs.dapp.entity.DataDictionaryCustom;
-import cc.mrbird.febs.dapp.entity.IgtOnHookPlanOrderItem;
+import cc.mrbird.febs.dapp.entity.*;
import cc.mrbird.febs.dapp.enumerate.DataDictionaryEnum;
import cc.mrbird.febs.dapp.enumerate.MemberOnHookPlanEnum;
-import cc.mrbird.febs.dapp.mapper.DappMemberDao;
-import cc.mrbird.febs.dapp.mapper.DappOnHookAwardDao;
-import cc.mrbird.febs.dapp.mapper.DataDictionaryCustomMapper;
+import cc.mrbird.febs.dapp.mapper.*;
+import cc.mrbird.febs.dapp.service.DappWalletService;
import cc.mrbird.febs.dapp.service.MemberOnHookPlan;
import cc.mrbird.febs.job.MineProfitJob;
import cn.hutool.core.codec.Base64;
+import cn.hutool.core.collection.CollUtil;
import cn.hutool.core.date.DateTime;
import cn.hutool.core.date.DateUnit;
import cn.hutool.core.date.DateUtil;
@@ -27,6 +24,7 @@
import cn.hutool.crypto.asymmetric.RSA;
import cn.hutool.json.JSONObject;
import cn.hutool.json.JSONUtil;
+import org.jline.utils.Log;
import org.junit.jupiter.api.Test;
import org.springframework.beans.factory.annotation.Autowired;
import org.springframework.boot.test.context.SpringBootTest;
@@ -84,74 +82,178 @@
// System.out.println(s);
// }
//
+// @Autowired
+// private DataDictionaryCustomMapper dataDictionaryCustomMapper;
+// @Autowired
+// private RedisUtils redisUtils;
+// @Autowired
+// private DappOnHookAwardDao dappOnHookAwardDao;
+// @Test
+// public void getmember(){//获取下一个开奖
+// String redisKey = "on_hook_award_id";
+// String onHookAwardRedisId = redisUtils.getString(redisKey);
+// DappOnHookAward dappOnHookAward = dappOnHookAwardDao.selectById(Long.parseLong(onHookAwardRedisId));
+// if(ObjectUtil.isEmpty(dappOnHookAward)){
+// throw new FebsException(MessageSourceUtils.getString("login_err_003"));
+// }
+// Date awardTime = dappOnHookAward.getAwardTime();
+// System.out.println(awardTime);
+// DateTime dateTime = DateUtil.offsetMinute(awardTime, 5);
+// for(int i =1; i < 100;i++){
+// String yyyyMMddHHMM = DateUtil.format(dateTime, "yyyy-MM-dd HH:mm");
+//// DappOnHookAward dappOnHookAwardNext = dappOnHookAwardDao.selectByByAwardTime(yyyyMMddHHMM);
+// System.out.println(yyyyMMddHHMM);
+// dateTime = DateUtil.offsetMinute(dateTime, 5);
+// }
+// }
+//
+// @Autowired
+// private DappMemberDao dappMemberDao;
+// @Test
+// public void getplan(){
+// DappMemberEntity dappMember = dappMemberDao.selectById(33);
+// List<DataDictionaryCustom> dataDictionaryCustoms = dataDictionaryCustomMapper.selectDicByType(DataDictionaryEnum.PLAN_A.getType());
+// LinkedList<Map<String,String>> strings = new LinkedList<>();
+// for(DataDictionaryCustom dataDictionaryCustom : dataDictionaryCustoms){
+// Map<String, String> stringStringHashMap = new HashMap<>();
+// stringStringHashMap.put(dataDictionaryCustom.getDescription(),dataDictionaryCustom.getValue());
+// strings.add(stringStringHashMap);
+// }
+// //收益率
+// BigDecimal hangingRevenue = BigDecimal.ZERO;
+// //挂机时长
+// DataDictionaryCustom maxHours = dataDictionaryCustomMapper.selectDicDataByTypeAndCode(DataDictionaryEnum.MAX_HOURS.getType(), DataDictionaryEnum.MAX_HOURS.getCode());
+// if(ObjectUtil.isEmpty(maxHours)){
+// throw new FebsException(MessageSourceUtils.getString("login_err_003"));
+// }
+//
+// Double maxHoursValue = Double.parseDouble(maxHours.getValue());
+// //获取用户信息的是否盈利字段
+// Integer isProfit = dappMember.getIsProfit() == null ? 1 : dappMember.getIsProfit();
+// String identity = null;
+// if(isProfit == 2){
+// identity = "IS_PROFIT_NO";
+// }else{
+// identity = "LEVEL_MB";
+// DataDictionaryCustom levelMember = dataDictionaryCustomMapper.selectDicDataByTypeAndCode(DataDictionaryEnum.LEVEL_MB.getType(), dappMember.getIdentity());
+// if(ObjectUtil.isEmpty(levelMember)){
+// throw new FebsException(MessageSourceUtils.getString("login_err_003"));
+// }
+// String levelMemberValue = levelMember.getValue();
+// JSONObject levelMemberValueParse = JSONUtil.parseObj(levelMemberValue);
+// hangingRevenue = new BigDecimal(levelMemberValueParse.get("hangingRevenue").toString())
+// .multiply(new BigDecimal(0.01)).setScale(4,BigDecimal.ROUND_DOWN);
+// }
+// //获取挂机字表的顺序
+// LinkedList<String> isProfitPlan = new LinkedList<>();
+// Map<String, LinkedList<String>> identity_level = MemberOnHookPlanEnum.valueOf(identity)
+// .getMemberOnHook(maxHoursValue,hangingRevenue,strings);
+// isProfitPlan = identity_level.get(identity);
+// System.out.println(isProfitPlan);
+//
+// }
+//
+//
+// @Autowired
+// private DappWalletCoinDao dappWalletCoinDao;
+//
+//
+// @Autowired
+// private DappWalletCoinDao dappWalletCoinDao;
+//
+// @Test
+// public void updateMemberLevel(){
+// Log.info("更新用户代理等级");
+// DateTime date = DateUtil.date();
+// //查询账户总金额大于51的有效用户
+// 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());
+// }
+// }
+//
+// private List<DappMemberEntity> getMemberLevelList(List<DappMemberEntity> dappMemberEntities,String identity,String identityNext){
+// List<DappMemberEntity> dappMemberEntitiesNext = new ArrayList<>();
+// if(CollUtil.isNotEmpty(dappMemberEntities)){
+// for(DappMemberEntity dappMemberEntity : dappMemberEntities){
+// 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()){
+// //设置identityNext级别
+// dappMemberDao.updateIdentityByMemberId(identityNext,memberEntityId);
+// //获取他的上级会员信息
+// DappMemberEntity dappMemberEntityNext = dappMemberDao.selectMemberInfoByInviteId(refererId);
+// dappMemberEntitiesNext.add(dappMemberEntityNext);
+// }
+// }
+// }
+// return dappMemberEntitiesNext;
+// }
+
+
+
+
@Autowired
- private DataDictionaryCustomMapper dataDictionaryCustomMapper;
+ private IgtOnHookPlanOrderItemDao igtOnHookPlanOrderItemDao;
+
@Autowired
- private RedisUtils redisUtils;
+ private IgtOnHookPlanOrderDao igtOnHookPlanOrderDao;
+
@Autowired
- private DappOnHookAwardDao dappOnHookAwardDao;
- @Test
- public void getmember(){//获取下一个开奖
- String redisKey = "on_hook_award_id";
- String onHookAwardRedisId = redisUtils.getString(redisKey);
- DappOnHookAward dappOnHookAward = dappOnHookAwardDao.selectById(Long.parseLong(onHookAwardRedisId));
- if(ObjectUtil.isEmpty(dappOnHookAward)){
- throw new FebsException(MessageSourceUtils.getString("login_err_003"));
- }
- Date awardTime = dappOnHookAward.getAwardTime();
- System.out.println(awardTime);
- DateTime dateTime = DateUtil.offsetMinute(awardTime, 5);
- for(int i =1; i < 100;i++){
- String yyyyMMddHHMM = DateUtil.format(dateTime, "yyyy-MM-dd HH:mm");
-// DappOnHookAward dappOnHookAwardNext = dappOnHookAwardDao.selectByByAwardTime(yyyyMMddHHMM);
- System.out.println(yyyyMMddHHMM);
- dateTime = DateUtil.offsetMinute(dateTime, 5);
- }
- }
+ private DappWalletCoinDao dappWalletCoinDao;
+
+ @Autowired
+ private DappAccountMoneyChangeDao dappAccountMoneyChangeDao;
@Autowired
private DappMemberDao dappMemberDao;
- @Test
- public void getplan(){
- DappMemberEntity dappMember = dappMemberDao.selectById(33);
- List<DataDictionaryCustom> dataDictionaryCustoms = dataDictionaryCustomMapper.selectDicByType(DataDictionaryEnum.PLAN_A.getType());
- LinkedList<Map<String,String>> strings = new LinkedList<>();
- for(DataDictionaryCustom dataDictionaryCustom : dataDictionaryCustoms){
- Map<String, String> stringStringHashMap = new HashMap<>();
- stringStringHashMap.put(dataDictionaryCustom.getDescription(),dataDictionaryCustom.getValue());
- strings.add(stringStringHashMap);
- }
- //收益率
- BigDecimal hangingRevenue = BigDecimal.ZERO;
- //挂机时长
- DataDictionaryCustom maxHours = dataDictionaryCustomMapper.selectDicDataByTypeAndCode(DataDictionaryEnum.MAX_HOURS.getType(), DataDictionaryEnum.MAX_HOURS.getCode());
- if(ObjectUtil.isEmpty(maxHours)){
- throw new FebsException(MessageSourceUtils.getString("login_err_003"));
- }
- Double maxHoursValue = Double.parseDouble(maxHours.getValue());
- //获取用户信息的是否盈利字段
- Integer isProfit = dappMember.getIsProfit() == null ? 1 : dappMember.getIsProfit();
- String identity = null;
- if(isProfit == 2){
- identity = "IS_PROFIT_NO";
- }else{
- identity = "LEVEL_MB";
- DataDictionaryCustom levelMember = dataDictionaryCustomMapper.selectDicDataByTypeAndCode(DataDictionaryEnum.LEVEL_MB.getType(), dappMember.getIdentity());
- if(ObjectUtil.isEmpty(levelMember)){
- throw new FebsException(MessageSourceUtils.getString("login_err_003"));
+ @Autowired
+ private DappOnHookAwardDao dappOnHookAwardDao;
+
+ @Autowired
+ private RedisUtils redisUtils;
+
+ @Autowired
+ private DataDictionaryCustomMapper dataDictionaryCustomMapper;
+
+ @Autowired
+ private DappWalletService dappWalletService;
+ @Test
+ public void testProfitSharing(){
+ IgtOnHookPlanOrder igtOnHookPlanOrder = igtOnHookPlanOrderDao.selectById(125L);
+ Long orderId = igtOnHookPlanOrder.getId();
+ Long memberId = igtOnHookPlanOrder.getMemberId();
+ BigDecimal planAmount = igtOnHookPlanOrder.getPlanAmount();
+ BigDecimal avaAmount = igtOnHookPlanOrder.getAvaAmount();
+ IgtOnHookPlanOrderItem igtOnHookPlanOrderItem = igtOnHookPlanOrderItemDao.selectByOrderIdAndMemberIdAndState(orderId,memberId,2);
+ if(ObjectUtil.isEmpty(igtOnHookPlanOrderItem)){
+ BigDecimal totalProfit = igtOnHookPlanOrderItemDao.selectTotalProfitByByOrderIdAndMemberIdAndState(orderId,memberId,1,2);
+
+ System.out.println(totalProfit);
+ DappMemberEntity dappMemberEntity = dappMemberDao.selectById(memberId);
+ String refererIds = dappMemberEntity.getRefererIds();
+ List<String> refererIdList = StrUtil.split(refererIds, ",", -1, true, true);
+ //生成流水佣金和盈利分成和流水记录，返回剩余盈利
+ totalProfit = dappWalletService.updateLSYJYLFC(refererIdList, totalProfit);
+ System.out.println("流水佣金和盈利分成"+totalProfit);
+ //平台分成，返回剩余盈利
+ totalProfit = dappWalletService.updatePTFC(memberId,totalProfit);
+ System.out.println("平台分成"+totalProfit);
}
- String levelMemberValue = levelMember.getValue();
- JSONObject levelMemberValueParse = JSONUtil.parseObj(levelMemberValue);
- hangingRevenue = new BigDecimal(levelMemberValueParse.get("hangingRevenue").toString())
- .multiply(new BigDecimal(0.01)).setScale(4,BigDecimal.ROUND_DOWN);
- }
- //获取挂机字表的顺序
- LinkedList<String> isProfitPlan = new LinkedList<>();
- Map<String, LinkedList<String>> identity_level = MemberOnHookPlanEnum.valueOf(identity)
- .getMemberOnHook(maxHoursValue,hangingRevenue,strings);
- isProfitPlan = identity_level.get(identity);
- System.out.println(isProfitPlan);
}
--
Gitblit v1.9.1