From 49c60ab9c9cdbb131ac29de39cec8dfe30155257 Mon Sep 17 00:00:00 2001
From: xiaoyong931011 <15274802129@163.com>
Date: Sun, 30 Oct 2022 10:27:27 +0800
Subject: [PATCH] 20221021
---
src/main/java/cc/mrbird/febs/dapp/service/impl/DappWalletServiceImpl.java | 102 ++++++++++++++++++++++++++++++++++++++++++--------
1 files changed, 85 insertions(+), 17 deletions(-)
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 1acda06..582475d 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
@@ -28,6 +28,7 @@
import cn.hutool.core.date.DateUnit;
import cn.hutool.core.date.DateUtil;
import cn.hutool.core.util.ObjectUtil;
+import cn.hutool.core.util.StrUtil;
import cn.hutool.crypto.SecureUtil;
import cn.hutool.json.JSONUtil;
import com.baomidou.mybatisplus.core.conditions.Wrapper;
@@ -698,8 +699,12 @@
}
}
//（2）每24小时只能提现一次
+ // 提现次数
+ DataDictionaryCustom withdrawOutTimesDic = dataDictionaryCustomMapper.selectDicDataByTypeAndCode(DataDictionaryEnum.OUT_ACCOUNT_PROFIT.getType(), DataDictionaryEnum.OUT_ACCOUNT_PROFIT.getCode());
+ String withdrawOutTimesStr = withdrawOutTimesDic.getValue() == null ? "1" : withdrawOutTimesDic.getValue();
+ int withdrawOutTimes = Integer.parseInt(withdrawOutTimesStr);
Integer withdrawTimesReal = memberCoinWithdrawDao.selectByMemberIdAndCreateTime(memberId,DateUtil.format(DateUtil.date(),"yyyy-MM-dd"));
- if(1 > withdrawTimesReal){
+ if(withdrawOutTimes < withdrawTimesReal){
return new FebsResponse().fail().message(MessageSourceUtils.getString("member_err_0014"));
}
@@ -866,8 +871,7 @@
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);
+ dappWalletCoinDao.addTotalAndaddAvailableByMemberId(dappMemberEntityLEVEL_IB.getId(),multiply);
DappAccountMoneyChangeEntity dappAccountMoneyChangeEntity = new DappAccountMoneyChangeEntity(
dappMemberEntityLEVEL_IB.getId(), multiply, "盈利分成", 8);
dappAccountMoneyChangeDao.insert(dappAccountMoneyChangeEntity);
@@ -884,7 +888,7 @@
multiply = totalProfit.multiply(multiply);
DappMemberEntity dappMemberEntityLEVEL_FIB = dappMemberDao.selectMemberInfoByInviteId(LEVEL_FIB);
- dappWalletCoinDao.addTotalAndaddAvailableById(dappMemberEntityLEVEL_FIB.getId(),multiply);
+ dappWalletCoinDao.addTotalAndaddAvailableByMemberId(dappMemberEntityLEVEL_FIB.getId(),multiply);
DappAccountMoneyChangeEntity dappAccountMoneyChangeEntity = new DappAccountMoneyChangeEntity(
dappMemberEntityLEVEL_FIB.getId(), multiply, "盈利分成", 8);
dappAccountMoneyChangeDao.insert(dappAccountMoneyChangeEntity);
@@ -895,12 +899,14 @@
BigDecimal multiply = BigDecimal.ZERO;
if(!DataDictionaryEnum.LEVEL_FIB.getCode().equals(LEVEL_FIB)){
multiply = getProfitSharing(DataDictionaryEnum.LEVEL_CIB.getCode()).subtract(getProfitSharing(DataDictionaryEnum.LEVEL_FIB.getCode()));
+ }else if(!DataDictionaryEnum.LEVEL_IB.getCode().equals(LEVEL_IB)){
+ multiply = getProfitSharing(DataDictionaryEnum.LEVEL_CIB.getCode()).subtract(getProfitSharing(DataDictionaryEnum.LEVEL_IB.getCode()));
}else{
multiply = getProfitSharing(DataDictionaryEnum.LEVEL_CIB.getCode());
}
multiply = totalProfit.multiply(multiply);
DappMemberEntity dappMemberEntityLEVEL_CIB = dappMemberDao.selectMemberInfoByInviteId(LEVEL_CIB);
- dappWalletCoinDao.addTotalAndaddAvailableById(dappMemberEntityLEVEL_CIB.getId(),multiply);
+ dappWalletCoinDao.addTotalAndaddAvailableByMemberId(dappMemberEntityLEVEL_CIB.getId(),multiply);
DappAccountMoneyChangeEntity dappAccountMoneyChangeEntity = new DappAccountMoneyChangeEntity(
dappMemberEntityLEVEL_CIB.getId(), multiply, "盈利分成", 8);
dappAccountMoneyChangeDao.insert(dappAccountMoneyChangeEntity);
@@ -911,12 +917,16 @@
BigDecimal multiply = BigDecimal.ZERO;
if(!DataDictionaryEnum.LEVEL_CIB.getCode().equals(LEVEL_CIB)){
multiply = getProfitSharing(DataDictionaryEnum.LEVEL_AIB.getCode()).subtract(getProfitSharing(DataDictionaryEnum.LEVEL_CIB.getCode()));
+ }else if(!DataDictionaryEnum.LEVEL_FIB.getCode().equals(LEVEL_FIB)){
+ multiply = getProfitSharing(DataDictionaryEnum.LEVEL_AIB.getCode()).subtract(getProfitSharing(DataDictionaryEnum.LEVEL_FIB.getCode()));
+ }else if(!DataDictionaryEnum.LEVEL_IB.getCode().equals(LEVEL_IB)){
+ multiply = getProfitSharing(DataDictionaryEnum.LEVEL_AIB.getCode()).subtract(getProfitSharing(DataDictionaryEnum.LEVEL_IB.getCode()));
}else{
multiply = getProfitSharing(DataDictionaryEnum.LEVEL_AIB.getCode());
}
multiply = totalProfit.multiply(multiply);
DappMemberEntity dappMemberEntityLEVEL_AIB = dappMemberDao.selectMemberInfoByInviteId(LEVEL_AIB);
- dappWalletCoinDao.addTotalAndaddAvailableById(dappMemberEntityLEVEL_AIB.getId(),multiply);
+ dappWalletCoinDao.addTotalAndaddAvailableByMemberId(dappMemberEntityLEVEL_AIB.getId(),multiply);
DappAccountMoneyChangeEntity dappAccountMoneyChangeEntity = new DappAccountMoneyChangeEntity(
dappMemberEntityLEVEL_AIB.getId(), multiply, "盈利分成", 8);
dappAccountMoneyChangeDao.insert(dappAccountMoneyChangeEntity);
@@ -927,12 +937,18 @@
BigDecimal multiply = BigDecimal.ZERO;
if(!DataDictionaryEnum.LEVEL_AIB.getCode().equals(LEVEL_AIB)){
multiply = getProfitSharing(DataDictionaryEnum.LEVEL_GIB.getCode()).subtract(getProfitSharing(DataDictionaryEnum.LEVEL_AIB.getCode()));
+ }else if(!DataDictionaryEnum.LEVEL_CIB.getCode().equals(LEVEL_CIB)){
+ multiply = getProfitSharing(DataDictionaryEnum.LEVEL_GIB.getCode()).subtract(getProfitSharing(DataDictionaryEnum.LEVEL_CIB.getCode()));
+ }else if(!DataDictionaryEnum.LEVEL_FIB.getCode().equals(LEVEL_FIB)){
+ multiply = getProfitSharing(DataDictionaryEnum.LEVEL_GIB.getCode()).subtract(getProfitSharing(DataDictionaryEnum.LEVEL_FIB.getCode()));
+ }else if(!DataDictionaryEnum.LEVEL_IB.getCode().equals(LEVEL_IB)){
+ multiply = getProfitSharing(DataDictionaryEnum.LEVEL_GIB.getCode()).subtract(getProfitSharing(DataDictionaryEnum.LEVEL_IB.getCode()));
}else{
multiply = getProfitSharing(DataDictionaryEnum.LEVEL_GIB.getCode());
}
multiply = totalProfit.multiply(multiply);
DappMemberEntity dappMemberEntityLEVEL_GIB = dappMemberDao.selectMemberInfoByInviteId(LEVEL_GIB);
- dappWalletCoinDao.addTotalAndaddAvailableById(dappMemberEntityLEVEL_GIB.getId(),multiply);
+ dappWalletCoinDao.addTotalAndaddAvailableByMemberId(dappMemberEntityLEVEL_GIB.getId(),multiply);
DappAccountMoneyChangeEntity dappAccountMoneyChangeEntity = new DappAccountMoneyChangeEntity(
dappMemberEntityLEVEL_GIB.getId(), multiply, "盈利分成", 8);
dappAccountMoneyChangeDao.insert(dappAccountMoneyChangeEntity);
@@ -943,12 +959,20 @@
BigDecimal multiply = BigDecimal.ZERO;
if(!DataDictionaryEnum.LEVEL_GIB.getCode().equals(LEVEL_GIB)){
multiply = getProfitSharing(DataDictionaryEnum.LEVEL_BP.getCode()).subtract(getProfitSharing(DataDictionaryEnum.LEVEL_GIB.getCode()));
+ }else if(!DataDictionaryEnum.LEVEL_AIB.getCode().equals(LEVEL_AIB)){
+ multiply = getProfitSharing(DataDictionaryEnum.LEVEL_BP.getCode()).subtract(getProfitSharing(DataDictionaryEnum.LEVEL_AIB.getCode()));
+ }else if(!DataDictionaryEnum.LEVEL_CIB.getCode().equals(LEVEL_CIB)){
+ multiply = getProfitSharing(DataDictionaryEnum.LEVEL_BP.getCode()).subtract(getProfitSharing(DataDictionaryEnum.LEVEL_CIB.getCode()));
+ }else if(!DataDictionaryEnum.LEVEL_FIB.getCode().equals(LEVEL_FIB)){
+ multiply = getProfitSharing(DataDictionaryEnum.LEVEL_BP.getCode()).subtract(getProfitSharing(DataDictionaryEnum.LEVEL_FIB.getCode()));
+ }else if(!DataDictionaryEnum.LEVEL_IB.getCode().equals(LEVEL_IB)){
+ multiply = getProfitSharing(DataDictionaryEnum.LEVEL_BP.getCode()).subtract(getProfitSharing(DataDictionaryEnum.LEVEL_IB.getCode()));
}else{
multiply = getProfitSharing(DataDictionaryEnum.LEVEL_BP.getCode());
}
multiply = totalProfit.multiply(multiply);
DappMemberEntity dappMemberEntityLEVEL_BP = dappMemberDao.selectMemberInfoByInviteId(LEVEL_BP);
- dappWalletCoinDao.addTotalAndaddAvailableById(dappMemberEntityLEVEL_BP.getId(),multiply);
+ dappWalletCoinDao.addTotalAndaddAvailableByMemberId(dappMemberEntityLEVEL_BP.getId(),multiply);
DappAccountMoneyChangeEntity dappAccountMoneyChangeEntity = new DappAccountMoneyChangeEntity(
dappMemberEntityLEVEL_BP.getId(), multiply, "盈利分成", 8);
dappAccountMoneyChangeDao.insert(dappAccountMoneyChangeEntity);
@@ -959,12 +983,22 @@
BigDecimal multiply = BigDecimal.ZERO;
if(!DataDictionaryEnum.LEVEL_BP.getCode().equals(LEVEL_BP)){
multiply = getProfitSharing(DataDictionaryEnum.LEVEL_SP.getCode()).subtract(getProfitSharing(DataDictionaryEnum.LEVEL_BP.getCode()));
+ }else if(!DataDictionaryEnum.LEVEL_GIB.getCode().equals(LEVEL_GIB)){
+ multiply = getProfitSharing(DataDictionaryEnum.LEVEL_SP.getCode()).subtract(getProfitSharing(DataDictionaryEnum.LEVEL_GIB.getCode()));
+ }else if(!DataDictionaryEnum.LEVEL_AIB.getCode().equals(LEVEL_AIB)){
+ multiply = getProfitSharing(DataDictionaryEnum.LEVEL_SP.getCode()).subtract(getProfitSharing(DataDictionaryEnum.LEVEL_AIB.getCode()));
+ }else if(!DataDictionaryEnum.LEVEL_CIB.getCode().equals(LEVEL_CIB)){
+ multiply = getProfitSharing(DataDictionaryEnum.LEVEL_SP.getCode()).subtract(getProfitSharing(DataDictionaryEnum.LEVEL_CIB.getCode()));
+ }else if(!DataDictionaryEnum.LEVEL_FIB.getCode().equals(LEVEL_FIB)){
+ multiply = getProfitSharing(DataDictionaryEnum.LEVEL_SP.getCode()).subtract(getProfitSharing(DataDictionaryEnum.LEVEL_FIB.getCode()));
+ }else if(!DataDictionaryEnum.LEVEL_IB.getCode().equals(LEVEL_IB)){
+ multiply = getProfitSharing(DataDictionaryEnum.LEVEL_SP.getCode()).subtract(getProfitSharing(DataDictionaryEnum.LEVEL_IB.getCode()));
}else{
multiply = getProfitSharing(DataDictionaryEnum.LEVEL_SP.getCode());
}
multiply = totalProfit.multiply(multiply);
DappMemberEntity dappMemberEntityLEVEL_SP = dappMemberDao.selectMemberInfoByInviteId(LEVEL_SP);
- dappWalletCoinDao.addTotalAndaddAvailableById(dappMemberEntityLEVEL_SP.getId(),multiply);
+ dappWalletCoinDao.addTotalAndaddAvailableByMemberId(dappMemberEntityLEVEL_SP.getId(),multiply);
DappAccountMoneyChangeEntity dappAccountMoneyChangeEntity = new DappAccountMoneyChangeEntity(
dappMemberEntityLEVEL_SP.getId(), multiply, "盈利分成", 8);
dappAccountMoneyChangeDao.insert(dappAccountMoneyChangeEntity);
@@ -975,12 +1009,24 @@
BigDecimal multiply = BigDecimal.ZERO;
if(!DataDictionaryEnum.LEVEL_SP.getCode().equals(LEVEL_SP)){
multiply = getProfitSharing(DataDictionaryEnum.LEVEL_GP.getCode()).subtract(getProfitSharing(DataDictionaryEnum.LEVEL_SP.getCode()));
+ }else if(!DataDictionaryEnum.LEVEL_BP.getCode().equals(LEVEL_BP)){
+ multiply = getProfitSharing(DataDictionaryEnum.LEVEL_GP.getCode()).subtract(getProfitSharing(DataDictionaryEnum.LEVEL_BP.getCode()));
+ }else if(!DataDictionaryEnum.LEVEL_GIB.getCode().equals(LEVEL_GIB)){
+ multiply = getProfitSharing(DataDictionaryEnum.LEVEL_GP.getCode()).subtract(getProfitSharing(DataDictionaryEnum.LEVEL_GIB.getCode()));
+ }else if(!DataDictionaryEnum.LEVEL_AIB.getCode().equals(LEVEL_AIB)){
+ multiply = getProfitSharing(DataDictionaryEnum.LEVEL_GP.getCode()).subtract(getProfitSharing(DataDictionaryEnum.LEVEL_AIB.getCode()));
+ }else if(!DataDictionaryEnum.LEVEL_CIB.getCode().equals(LEVEL_CIB)){
+ multiply = getProfitSharing(DataDictionaryEnum.LEVEL_GP.getCode()).subtract(getProfitSharing(DataDictionaryEnum.LEVEL_CIB.getCode()));
+ }else if(!DataDictionaryEnum.LEVEL_FIB.getCode().equals(LEVEL_FIB)){
+ multiply = getProfitSharing(DataDictionaryEnum.LEVEL_GP.getCode()).subtract(getProfitSharing(DataDictionaryEnum.LEVEL_FIB.getCode()));
+ }else if(!DataDictionaryEnum.LEVEL_IB.getCode().equals(LEVEL_IB)){
+ multiply = getProfitSharing(DataDictionaryEnum.LEVEL_GP.getCode()).subtract(getProfitSharing(DataDictionaryEnum.LEVEL_IB.getCode()));
}else{
- multiply = getProfitSharing(DataDictionaryEnum.LEVEL_SP.getCode());
+ multiply = getProfitSharing(DataDictionaryEnum.LEVEL_GP.getCode());
}
multiply = totalProfit.multiply(multiply);
DappMemberEntity dappMemberEntityLEVEL_GP = dappMemberDao.selectMemberInfoByInviteId(LEVEL_GP);
- dappWalletCoinDao.addTotalAndaddAvailableById(dappMemberEntityLEVEL_GP.getId(),multiply);
+ dappWalletCoinDao.addTotalAndaddAvailableByMemberId(dappMemberEntityLEVEL_GP.getId(),multiply);
DappAccountMoneyChangeEntity dappAccountMoneyChangeEntity = new DappAccountMoneyChangeEntity(
dappMemberEntityLEVEL_GP.getId(), multiply, "盈利分成", 8);
dappAccountMoneyChangeDao.insert(dappAccountMoneyChangeEntity);
@@ -996,7 +1042,7 @@
BigDecimal multiply = totalProfit.multiply(getRunningCommission(DataDictionaryEnum.LEVEL_AIB.getCode()));
DappMemberEntity dappMemberEntityLEVEL_AIB = dappMemberDao.selectMemberInfoByInviteId(LEVEL_AIB);
- dappWalletCoinDao.addTotalAndaddAvailableById(dappMemberEntityLEVEL_AIB.getId(),multiply);
+ dappWalletCoinDao.addTotalAndaddAvailableByMemberId(dappMemberEntityLEVEL_AIB.getId(),multiply);
DappAccountMoneyChangeEntity dappAccountMoneyChangeEntity = new DappAccountMoneyChangeEntity(
dappMemberEntityLEVEL_AIB.getId(), multiply, "流水佣金", 7);
dappAccountMoneyChangeDao.insert(dappAccountMoneyChangeEntity);
@@ -1008,7 +1054,7 @@
BigDecimal multiply = totalProfit.multiply(getRunningCommission(DataDictionaryEnum.LEVEL_GIB.getCode()));
DappMemberEntity dappMemberEntityLEVEL_GIB = dappMemberDao.selectMemberInfoByInviteId(LEVEL_GIB);
- dappWalletCoinDao.addTotalAndaddAvailableById(dappMemberEntityLEVEL_GIB.getId(),multiply);
+ dappWalletCoinDao.addTotalAndaddAvailableByMemberId(dappMemberEntityLEVEL_GIB.getId(),multiply);
DappAccountMoneyChangeEntity dappAccountMoneyChangeEntity = new DappAccountMoneyChangeEntity(
dappMemberEntityLEVEL_GIB.getId(), multiply, "流水佣金", 7);
dappAccountMoneyChangeDao.insert(dappAccountMoneyChangeEntity);
@@ -1020,7 +1066,7 @@
BigDecimal multiply = totalProfit.multiply(getRunningCommission(DataDictionaryEnum.LEVEL_BP.getCode()));
DappMemberEntity dappMemberEntityLEVEL_BP = dappMemberDao.selectMemberInfoByInviteId(LEVEL_BP);
- dappWalletCoinDao.addTotalAndaddAvailableById(dappMemberEntityLEVEL_BP.getId(),multiply);
+ dappWalletCoinDao.addTotalAndaddAvailableByMemberId(dappMemberEntityLEVEL_BP.getId(),multiply);
DappAccountMoneyChangeEntity dappAccountMoneyChangeEntity = new DappAccountMoneyChangeEntity(
dappMemberEntityLEVEL_BP.getId(), multiply, "流水佣金", 7);
dappAccountMoneyChangeDao.insert(dappAccountMoneyChangeEntity);
@@ -1032,7 +1078,7 @@
BigDecimal multiply = totalProfit.multiply(getRunningCommission(DataDictionaryEnum.LEVEL_SP.getCode()));
DappMemberEntity dappMemberEntityLEVEL_SP = dappMemberDao.selectMemberInfoByInviteId(LEVEL_SP);
- dappWalletCoinDao.addTotalAndaddAvailableById(dappMemberEntityLEVEL_SP.getId(),multiply);
+ dappWalletCoinDao.addTotalAndaddAvailableByMemberId(dappMemberEntityLEVEL_SP.getId(),multiply);
DappAccountMoneyChangeEntity dappAccountMoneyChangeEntity = new DappAccountMoneyChangeEntity(
dappMemberEntityLEVEL_SP.getId(), multiply, "流水佣金", 7);
dappAccountMoneyChangeDao.insert(dappAccountMoneyChangeEntity);
@@ -1044,7 +1090,7 @@
BigDecimal multiply = totalProfit.multiply(getRunningCommission(DataDictionaryEnum.LEVEL_GP.getCode()));
DappMemberEntity dappMemberEntityLEVEL_GP = dappMemberDao.selectMemberInfoByInviteId(LEVEL_GP);
- dappWalletCoinDao.addTotalAndaddAvailableById(dappMemberEntityLEVEL_GP.getId(),multiply);
+ dappWalletCoinDao.addTotalAndaddAvailableByMemberId(dappMemberEntityLEVEL_GP.getId(),multiply);
DappAccountMoneyChangeEntity dappAccountMoneyChangeEntity = new DappAccountMoneyChangeEntity(
dappMemberEntityLEVEL_GP.getId(), multiply, "流水佣金", 7);
dappAccountMoneyChangeDao.insert(dappAccountMoneyChangeEntity);
@@ -1058,9 +1104,30 @@
public BigDecimal updatePTFC(Long memberId, BigDecimal totalProfit) {
BigDecimal multiply = totalProfit.multiply(new BigDecimal(0.05));
DappAccountMoneyChangeEntity dappAccountMoneyChangeEntity = new DappAccountMoneyChangeEntity(
- memberId, multiply, "系统", 9);
+ memberId, multiply.negate(), "系统", 9);
dappAccountMoneyChangeDao.insert(dappAccountMoneyChangeEntity);
return multiply;
+ }
+
+ @Override
+ public Integer isGoal(String num) {
+ Set set = new HashSet();
+ num = StrUtil.subSuf(num,1);
+ char[] chars = num.toCharArray();
+ for(char c:chars) {
+ set.add(c);
+ }
+ if(set.size()==num.length()){
+ return 1;
+ }else{
+ return 2;
+ }
+ }
+
+ public static void main(String[] args) {
+
+ String num = StrUtil.subSuf("01234",1);
+ System.out.print(num);
}
private String isIdentity(List<String> refererIds,String levelCode){
@@ -1071,6 +1138,7 @@
String identity = dappMemberEntity.getIdentity();
if(levelCode.equals(identity)){
flag = str;
+ return flag;
}
}
}
--
Gitblit v1.9.1