From 2befccd8ba0a1eb5d270b48fa11972a959ac806a Mon Sep 17 00:00:00 2001
From: xiaoyong931011 <15274802129@163.com>
Date: Fri, 02 Jun 2023 15:59:12 +0800
Subject: [PATCH] twoCoin项目修改
---
src/main/java/cc/mrbird/febs/dapp/service/impl/DappSystemServiceImpl.java | 128 +++++++++++++++++++++++++++++++++++-------
1 files changed, 107 insertions(+), 21 deletions(-)
diff --git a/src/main/java/cc/mrbird/febs/dapp/service/impl/DappSystemServiceImpl.java b/src/main/java/cc/mrbird/febs/dapp/service/impl/DappSystemServiceImpl.java
index 6f82b1f..4584654 100644
--- a/src/main/java/cc/mrbird/febs/dapp/service/impl/DappSystemServiceImpl.java
+++ b/src/main/java/cc/mrbird/febs/dapp/service/impl/DappSystemServiceImpl.java
@@ -623,7 +623,7 @@
PoolEnum.COIN_A_PRICE.getType(),
PoolEnum.COIN_A_PRICE.getCode()
);
- BigDecimal coinAPrice = new BigDecimal(StrUtil.isEmpty(coinAPriceDic.getValue()) ? "0" : coinAPriceDic.getValue()).setScale(8,BigDecimal.ROUND_DOWN);
+ BigDecimal coinAPrice = new BigDecimal(StrUtil.isEmpty(coinAPriceDic.getValue()) ? "0" : coinAPriceDic.getValue()).setScale(12,BigDecimal.ROUND_DOWN);
/**
* 会员充值USDT买入A币记录的ID
*/
@@ -655,7 +655,7 @@
memberId,
amount.multiply(new BigDecimal(3)),
FundFlowEnum.MEMBER_AMOUNT_PERK_TOTAL.getCode(),
- 1,
+ 2,
BigDecimal.ZERO,
null,
chergeRecordId);
@@ -751,7 +751,7 @@
coinAUsdtPriceDic.setValue(coinAUsdtPriceDicCnt.toString());
dataDictionaryCustomMapper.updateById(coinAUsdtPriceDic);
- BigDecimal divide = coinAUsdtPriceDicCnt.divide(coinACntDicCnt, 8, BigDecimal.ROUND_DOWN);
+ BigDecimal divide = coinAUsdtPriceDicCnt.divide(coinACntDicCnt, 12, BigDecimal.ROUND_DOWN);
coinAPriceDic.setValue(divide.toString());
dataDictionaryCustomMapper.updateById(coinAPriceDic);
@@ -820,7 +820,11 @@
chergeRecordId);
dappFundFlowDao.insert(poolAllMemberAFundFlow);
- BigDecimal poolAllMemberAPercentCntAva = nodePoolPerk(poolAllMemberAPercentCnt, MemberLevelEnum.MEMBER.getType(), FundFlowEnum.POOL_MEMBER_A_CNT.getCode());
+// BigDecimal poolAllMemberAPercentCntAva = nodePoolPerk(poolAllMemberAPercentCnt, MemberLevelEnum.MEMBER.getType(), FundFlowEnum.POOL_MEMBER_A_CNT.getCode());
+ /**
+ * 20%全网加权平分，按照个人投资占比全网的比例去平分
+ */
+ BigDecimal poolAllMemberAPercentCntAva = allMemberPerk(poolAllMemberAPercentCnt, FundFlowEnum.POOL_MEMBER_A_CNT.getCode());
DappFundFlowEntity poolAllMemberAFundFlowAva = new DappFundFlowEntity(
1L,
poolAllMemberAPercentCnt.subtract(poolAllMemberAPercentCntAva),
@@ -984,6 +988,60 @@
*/
dappMemberDao.updateMemberActiveStatus(1,memberId);
+ }
+
+ private BigDecimal allMemberPerk(BigDecimal poolAllMemberAPercentCnt, int code) {
+
+ BigDecimal realPerkAmount = BigDecimal.ZERO;
+ /**
+ * 查询总业绩
+ */
+ List<DappChargeUsdtEntity> dappChargeUsdtEntities = dappChargeUsdtMapper.selectList(null);
+ if(CollUtil.isEmpty(dappChargeUsdtEntities)){
+ return realPerkAmount;
+ }
+ //总入金
+ BigDecimal amountAll = dappChargeUsdtEntities.stream().map(DappChargeUsdtEntity::getAmount).reduce(BigDecimal.ZERO, BigDecimal::add);
+ if(BigDecimal.ZERO.compareTo(amountAll) >= 0){
+ return realPerkAmount;
+ }
+ /**
+ * 每个人入金的总额
+ */
+ Map<Long, BigDecimal> amountMap = dappChargeUsdtEntities.stream().collect(
+ Collectors.groupingBy(DappChargeUsdtEntity::getMemberId,
+ Collectors.reducing(BigDecimal.ZERO, DappChargeUsdtEntity::getAmount, BigDecimal::add)));
+ /**
+ * 入金1U分的代币个数
+ */
+ BigDecimal usdtOfCnt = poolAllMemberAPercentCnt.divide(amountAll, 8, BigDecimal.ROUND_DOWN);
+
+ for (Map.Entry<Long, BigDecimal> entry : amountMap.entrySet()) {
+ Long memberId = entry.getKey();
+ //当前会员的入金总和
+ BigDecimal amount = entry.getValue();
+ if(BigDecimal.ZERO.compareTo(amount) >= 0){
+ continue;
+ }
+ //应该平分到的数量
+ BigDecimal memberCnt = amount.multiply(usdtOfCnt).setScale(8,BigDecimal.ROUND_DOWN);
+ BigDecimal fundFlowToMemberFlag = this.getAndUpdateMemberPerk(memberId, memberCnt);
+ if(fundFlowToMemberFlag.compareTo(BigDecimal.ZERO) > 0){
+ //生成一条50%客户秒到的资金流水记录
+ DappFundFlowEntity fundFlowToMember = new DappFundFlowEntity(
+ memberId,
+ fundFlowToMemberFlag,
+ code,
+ 2,
+ BigDecimal.ZERO);
+ dappFundFlowDao.insert(fundFlowToMember);
+ //用户的A币账户增加memberGetACnt数量
+ dappWalletService.updateWalletMineWithLock(fundFlowToMemberFlag,memberId,1);
+
+ realPerkAmount = realPerkAmount.add(fundFlowToMemberFlag);
+ }
+ }
+ return realPerkAmount;
}
@Override
@@ -1479,25 +1537,26 @@
public BigDecimal superNodePoolPerk(BigDecimal nodeFivePoolDicCnt, String code, int code1) {
BigDecimal realPerkAmount = BigDecimal.ZERO;
//获取type级别的会员
- List<DappMemberNodeEntity> dappMemberNodeEntities = dappMemberNodeMapper.selectNodeByNodeCode(NodeCodeEnum.SUPER_NODE.getCode());
+// List<DappMemberNodeEntity> dappMemberNodeEntities = dappMemberNodeMapper.selectNodeByNodeCode(NodeCodeEnum.SUPER_NODE.getCode());
+ List<DappMemberEntity> dappMemberEntities = dappMemberDao.selectByNodetype();
//每日补贴总数
// BigDecimal nodePerk = nodeFivePoolDicCnt.multiply(AppContants.NODE_PERK_PERCENT);
BigDecimal nodePerk = nodeFivePoolDicCnt;
- if(CollUtil.isNotEmpty(dappMemberNodeEntities)){
+ if(CollUtil.isNotEmpty(dappMemberEntities)){
//每人的补贴
- BigDecimal averagePerk = nodePerk.divide(new BigDecimal(dappMemberNodeEntities.size()), 4, BigDecimal.ROUND_DOWN);
+ BigDecimal averagePerk = nodePerk.divide(new BigDecimal(dappMemberEntities.size()), 4, BigDecimal.ROUND_DOWN);
- for(DappMemberNodeEntity dappMemberNodeEntity : dappMemberNodeEntities){
+ for(DappMemberEntity dappMemberEntitie : dappMemberEntities){
DappFundFlowEntity fundFlowToMember = new DappFundFlowEntity(
- dappMemberNodeEntity.getMemberId(),
+ dappMemberEntitie.getId(),
averagePerk,
code1,
2,
BigDecimal.ZERO);
dappFundFlowDao.insert(fundFlowToMember);
//用户的A币账户增加memberGetACnt数量
- dappWalletService.updateWalletMineWithLock(averagePerk,dappMemberNodeEntity.getMemberId(),1);
+ dappWalletService.updateWalletMineWithLock(averagePerk,dappMemberEntitie.getId(),1);
realPerkAmount = realPerkAmount.add(averagePerk);
}
@@ -1660,11 +1719,42 @@
DataDictionaryCustom coinAPriceDic = dataDictionaryCustomMapper.selectDicDataByTypeAndCode(
PoolEnum.COIN_A_PRICE.getType(),
PoolEnum.COIN_A_PRICE.getCode());
- BigDecimal coinAPrice = coinAUsdt.divide(coinACnt,8,BigDecimal.ROUND_DOWN);
+
+ BigDecimal coinAPrice = coinAUsdt.divide(coinACnt,12,BigDecimal.ROUND_DOWN);
coinAPriceDic.setValue(coinAPrice.toString());
dataDictionaryCustomMapper.updateById(coinAPriceDic);
+ /**
+ * 增加K线数据
+ */
+ DappAKlineEntity dappAKlineEntity = new DappAKlineEntity();
+ dappAKlineEntity.setType(0);
+ /**
+ * 获取最新一条小时或者分钟的数据
+ */
+ DappAKlineEntity oldOne = dappAKlineMapper.selectOneByType();
+ if(ObjectUtil.isNotEmpty(oldOne)){
+ dappAKlineEntity.setOpenPrice(oldOne.getClosePrice());
+ dappAKlineEntity.setLowestPrice(oldOne.getClosePrice());
+ }else{
+ dappAKlineEntity.setOpenPrice(coinAPrice);
+ dappAKlineEntity.setLowestPrice(coinAPrice);
+ }
+ dappAKlineEntity.setHighestPrice(coinAPrice);
+ dappAKlineEntity.setClosePrice(coinAPrice);
+ dappAKlineMapper.insert(dappAKlineEntity);
- chainProducer.sendAntKLineMsg(0);
+
+ List<cn.hutool.json.JSONObject> objects = new ArrayList<>();
+ List<AKLineLimitVo> akLineLimitVos = dappAKlineMapper.selectListByTypeAndLimit(0, AppContants.K_LINE_LIMIT);
+ if(CollUtil.isNotEmpty(akLineLimitVos)) {
+ Collections.reverse(akLineLimitVos);
+ for (AKLineLimitVo akLineLimitVo : akLineLimitVos) {
+ cn.hutool.json.JSONObject parseObj = JSONUtil.parseObj(akLineLimitVo);
+ objects.add(parseObj);
+ }
+ redisUtils.del(AppContants.K_LINE_NOW);
+ redisUtils.set(AppContants.K_LINE_NOW, objects.toString());
+ }
}
@Override
@@ -1725,7 +1815,7 @@
*/
DappAKlineEntity minRecord = dappAKlineMapper.selectOneHourByType();
if(ObjectUtil.isEmpty(minRecord)){
- minRecord = dappAKlineMapper.selectOneByType();
+ minRecord = dappAKlineMapper.selectOneByTypeAsc();
}
DappAKlineEntity maxRecord = dappAKlineMapper.selectOneByType();
List<DappAKlineEntity> dappAKlineEntities = dappAKlineMapper.selectListByIds(minRecord.getId(),maxRecord.getId());
@@ -1750,12 +1840,7 @@
dappAKlineEntity.setHighestPrice(coinAPrice);
dappAKlineEntity.setLowestPrice(coinAPrice);
}
- DappAKlineEntity oldOne = dappAKlineMapper.selectOneByType();
- if(ObjectUtil.isNotEmpty(oldOne)){
- dappAKlineEntity.setClosePrice(oldOne.getClosePrice());
- }else{
- dappAKlineEntity.setClosePrice(coinAPrice);
- }
+ dappAKlineEntity.setClosePrice(coinAPrice);
dappAKlineMapper.insert(dappAKlineEntity);
chainProducer.sendAntKLineMsg(1);
@@ -1898,7 +1983,7 @@
redisKey = AppContants.K_LINE_MONTH;
}else if(0 == type){
createKDate();
- return;
+ redisKey = AppContants.K_LINE_NOW;
}else{
return;
}
@@ -1973,10 +2058,11 @@
DappAKlineEntity oldOne = dappAKlineMapper.selectOneByType();
if(ObjectUtil.isNotEmpty(oldOne)){
dappAKlineEntity.setOpenPrice(oldOne.getClosePrice());
+ dappAKlineEntity.setLowestPrice(oldOne.getClosePrice());
}else{
dappAKlineEntity.setOpenPrice(coinAPrice);
+ dappAKlineEntity.setLowestPrice(coinAPrice);
}
- dappAKlineEntity.setLowestPrice(coinAPrice);
dappAKlineEntity.setHighestPrice(coinAPrice);
dappAKlineEntity.setClosePrice(coinAPrice);
dappAKlineMapper.insert(dappAKlineEntity);
--
Gitblit v1.9.1