From 86c9e2f51f0b8b0fb1a6ee4b6d6a703878ad53e8 Mon Sep 17 00:00:00 2001
From: xiaoyong931011 <15274802129@163.com>
Date: Fri, 11 Aug 2023 16:56:24 +0800
Subject: [PATCH] 数据修改
---
src/main/java/cc/mrbird/febs/dapp/service/impl/DappSystemServiceImpl.java | 86 ++++++++++++++++++++++++++++++++++---------
1 files changed, 68 insertions(+), 18 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 192c6d7..24cc842 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
@@ -2812,7 +2812,7 @@
* 获取用户前一天的所有返利记录
*/
List<DappFundFlowEntity> dappFundFlowEntities = dappFundFlowDao.selectListByMemberIdAndTypeAndDate(directMemberId,
- FundFlowEnum.STATIC_RELEASE.getCode(),DateUtil.offsetHour(DateUtil.date(),12));
+ FundFlowEnum.STATIC_RELEASE.getCode(),DateUtil.offsetHour(DateUtil.date(),-12));
for(DappFundFlowEntity dappFundFlowEntity : dappFundFlowEntities){
BigDecimal staticReleaseAmount = dappFundFlowEntity.getAmount();
BigDecimal directReleaseAmount = staticReleaseAmount.multiply(directRelease).setScale(2, BigDecimal.ROUND_DOWN);
@@ -2845,7 +2845,7 @@
* 获取用户前一天的所有返利记录
*/
List<DappFundFlowEntity> dappFundFlowEntities = dappFundFlowDao.selectListByMemberIdAndTypeAndDate(memberId,
- FundFlowEnum.STATIC_RELEASE.getCode(),DateUtil.offsetHour(DateUtil.date(),12));
+ FundFlowEnum.STATIC_RELEASE.getCode(),DateUtil.offsetHour(DateUtil.date(),-12));
for(DappFundFlowEntity dappFundFlowEntity : dappFundFlowEntities){
BigDecimal staticReleaseAmount = dappFundFlowEntity.getAmount();
BigDecimal directReleaseAmount = staticReleaseAmount.multiply(directRelease).setScale(2, BigDecimal.ROUND_DOWN);
@@ -2868,30 +2868,37 @@
List<DappMemberEntity> dappMemberEntities = dappMemberDao.selectMemberByAccountType(MemberLevelEnum.V1.getType());
shareStaticPerk(dappMemberEntities,FundFlowEnum.SHARE_PERK_V1.getCode());
teamStaticPerkMemberLevel(dappMemberEntities,teamPerkEquals,staticRelease,FundFlowEnum.TEAM_PERK_V1.getCode());
+ isAllPerkMemberLevel(dappMemberEntities,MemberLevelEnum.V1.getType(),FundFlowEnum.ALL_PERK_V1.getCode());
List<DappMemberEntity> v2DappMemberEntities = dappMemberDao.selectMemberByAccountType(MemberLevelEnum.V2.getType());
- shareStaticPerk(dappMemberEntities,FundFlowEnum.SHARE_PERK_V2.getCode());
+ shareStaticPerk(v2DappMemberEntities,FundFlowEnum.SHARE_PERK_V2.getCode());
teamStaticPerkMemberLevel(v2DappMemberEntities,teamPerkEquals,staticRelease,FundFlowEnum.TEAM_PERK_V2.getCode());
+ isAllPerkMemberLevel(v2DappMemberEntities,MemberLevelEnum.V2.getType(),FundFlowEnum.ALL_PERK_V2.getCode());
List<DappMemberEntity> v3DappMemberEntities = dappMemberDao.selectMemberByAccountType(MemberLevelEnum.V3.getType());
- shareStaticPerk(dappMemberEntities,FundFlowEnum.SHARE_PERK_V3.getCode());
+ shareStaticPerk(v3DappMemberEntities,FundFlowEnum.SHARE_PERK_V3.getCode());
teamStaticPerkMemberLevel(v3DappMemberEntities,teamPerkEquals,staticRelease,FundFlowEnum.TEAM_PERK_V3.getCode());
+ isAllPerkMemberLevel(v3DappMemberEntities,MemberLevelEnum.V3.getType(),FundFlowEnum.ALL_PERK_V3.getCode());
List<DappMemberEntity> v4DappMemberEntities = dappMemberDao.selectMemberByAccountType(MemberLevelEnum.V4.getType());
- shareStaticPerk(dappMemberEntities,FundFlowEnum.SHARE_PERK_V4.getCode());
+ shareStaticPerk(v4DappMemberEntities,FundFlowEnum.SHARE_PERK_V4.getCode());
teamStaticPerkMemberLevel(v4DappMemberEntities,teamPerkEquals,staticRelease,FundFlowEnum.TEAM_PERK_V4.getCode());
+ isAllPerkMemberLevel(v4DappMemberEntities,MemberLevelEnum.V4.getType(),FundFlowEnum.ALL_PERK_V4.getCode());
List<DappMemberEntity> v5DappMemberEntities = dappMemberDao.selectMemberByAccountType(MemberLevelEnum.V5.getType());
- shareStaticPerk(dappMemberEntities,FundFlowEnum.SHARE_PERK_V5.getCode());
+ shareStaticPerk(v5DappMemberEntities,FundFlowEnum.SHARE_PERK_V5.getCode());
teamStaticPerkMemberLevel(v5DappMemberEntities,teamPerkEquals,staticRelease,FundFlowEnum.TEAM_PERK_V5.getCode());
+ isAllPerkMemberLevel(v5DappMemberEntities,MemberLevelEnum.V5.getType(),FundFlowEnum.ALL_PERK_V5.getCode());
List<DappMemberEntity> v6DappMemberEntities = dappMemberDao.selectMemberByAccountType(MemberLevelEnum.V6.getType());
- shareStaticPerk(dappMemberEntities,FundFlowEnum.SHARE_PERK_V6.getCode());
+ shareStaticPerk(v6DappMemberEntities,FundFlowEnum.SHARE_PERK_V6.getCode());
teamStaticPerkMemberLevel(v6DappMemberEntities,teamPerkEquals,staticRelease,FundFlowEnum.TEAM_PERK_V6.getCode());
+ isAllPerkMemberLevel(v6DappMemberEntities,MemberLevelEnum.V6.getType(),FundFlowEnum.ALL_PERK_V6.getCode());
List<DappMemberEntity> v7DappMemberEntities = dappMemberDao.selectMemberByAccountType(MemberLevelEnum.V7.getType());
- shareStaticPerk(dappMemberEntities,FundFlowEnum.SHARE_PERK_V7.getCode());
+ shareStaticPerk(v7DappMemberEntities,FundFlowEnum.SHARE_PERK_V7.getCode());
teamStaticPerkMemberLevel(v7DappMemberEntities,teamPerkEquals,staticRelease,FundFlowEnum.TEAM_PERK_V7.getCode());
+ isAllPerkMemberLevel(v7DappMemberEntities,MemberLevelEnum.V7.getType(),FundFlowEnum.ALL_PERK_V7.getCode());
}
@@ -2951,7 +2958,9 @@
*/
for(MallAchieveRecord memberAchieve : mallAchieveRecords){
BigDecimal achieveAmount = memberAchieve.getAmount();
- if(amount.compareTo(achieveAmount) < 0){
+ if(BigDecimal.ZERO.compareTo(amount) >= 0){
+ break;
+ }else if(amount.compareTo(achieveAmount) < 0){
memberAchieve.setAmount(achieveAmount.subtract(amount).setScale(2,BigDecimal.ROUND_DOWN));
mallAchieveRecordMapper.updateById(memberAchieve);
localTotalAchieve = localTotalAchieve.add(amount);
@@ -3163,6 +3172,47 @@
}
}
+ public void isAllPerkMemberLevel(List<DappMemberEntity> dappMemberEntities,
+ String level,
+ int code){
+ if(CollUtil.isEmpty(dappMemberEntities)){
+ return;
+ }
+ DataDictionaryCustom teamPerkMemberDic = dataDictionaryCustomMapper.selectDicDataByTypeAndCode(
+ "TEAM_LEVEL", level);
+ TeamLevelPerk adminAgentInfo = JSONObject.parseObject(teamPerkMemberDic.getValue(), TeamLevelPerk.class);
+ BigDecimal orderSalePercent = adminAgentInfo.getOrderSalePercent();
+ if(BigDecimal.ZERO.compareTo(orderSalePercent) >= 0){
+ return;
+ }
+ allPerkMemberLevel(dappMemberEntities,level,code);
+
+ }
+
+ public void allPerkMemberLevel(List<DappMemberEntity> dappMemberEntities,
+ String level,
+ int code) {
+ /**
+ * 全网24小时内的全部分红
+ */
+ Date createTime = DateUtil.offsetHour(DateUtil.date(),-24);
+ //下第一单之后的共享区全部业绩
+ BigDecimal totalAchieve = mallAchieveRecordMapper.selectAchieveTotalByCreateTime(createTime);
+ if(BigDecimal.ZERO.compareTo(totalAchieve) >= 0){
+ return;
+ }
+ DataDictionaryCustom teamPerkMemberDic = dataDictionaryCustomMapper.selectDicDataByTypeAndCode(
+ "TEAM_LEVEL", level);
+ TeamLevelPerk adminAgentInfo = JSONObject.parseObject(teamPerkMemberDic.getValue(), TeamLevelPerk.class);
+ BigDecimal orderSalePercent = adminAgentInfo.getOrderSalePercent();
+ //每人平分数量
+ BigDecimal divide = totalAchieve.multiply(orderSalePercent).divide(new BigDecimal(dappMemberEntities.size()), 2, BigDecimal.ROUND_DOWN);
+
+ for(DappMemberEntity dappMemberEntity : dappMemberEntities){
+ sendPerk(dappMemberEntity, divide, dappMemberEntity.getId(), code);
+ }
+ }
+
public void teamStaticPerkMemberLevel(List<DappMemberEntity> dappMemberEntities,
BigDecimal teamPerkEquals,
BigDecimal staticRelease,
@@ -3217,15 +3267,6 @@
if(BigDecimal.ZERO.compareTo(directReleaseAmount) >= 0){
return realScoreReduce;
}
- //插入积分流水
- DappFundFlowEntity scoreFlow = new DappFundFlowEntity(
- parentMember.getId(),
- realScoreReduce.negate(),
- FundFlowEnum.REDUCE_SCORE.getCode(),
- DappFundFlowEntity.WITHDRAW_STATUS_AGREE,
- BigDecimal.ZERO,
- orderId);
- dappFundFlowDao.insert(scoreFlow);
//生成一条静态补贴的流水
DappFundFlowEntity realUsdtAmountFlow = new DappFundFlowEntity(
parentMember.getId(),
@@ -3235,6 +3276,15 @@
BigDecimal.ZERO,
orderId);
dappFundFlowDao.insert(realUsdtAmountFlow);
+ //插入积分流水
+ DappFundFlowEntity scoreFlow = new DappFundFlowEntity(
+ parentMember.getId(),
+ realScoreReduce.negate(),
+ FundFlowEnum.REDUCE_SCORE.getCode(),
+ DappFundFlowEntity.WITHDRAW_STATUS_AGREE,
+ BigDecimal.ZERO,
+ orderId);
+ dappFundFlowDao.insert(scoreFlow);
//插入余额流水
DappFundFlowEntity amountFlow = new DappFundFlowEntity(
parentMember.getId(),
--
Gitblit v1.9.1