From e832c0e8069aa0969e253095cc3be681b6ce5363 Mon Sep 17 00:00:00 2001
From: xiaoyong931011 <15274802129@163.com>
Date: Tue, 10 Jan 2023 18:10:09 +0800
Subject: [PATCH] 20221227 充值归集
---
src/main/java/cc/mrbird/febs/mall/service/impl/AgentServiceImpl.java | 31 +++++++++++++++++--------------
1 files changed, 17 insertions(+), 14 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 73282bc..b4373f0 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
@@ -194,8 +194,7 @@
MallMoneyFlowTypeEnum.MARKET_SUBSIDIES.getName()
);
-// memberWalletService.addBalance(subsidyAmount.setScale(4, BigDecimal.ROUND_DOWN),mallMember.getId());
- memberWalletService.add(subsidyAmount.setScale(4, BigDecimal.ROUND_DOWN), mallMember.getId(), "balance");
+ memberWalletService.addBalance(subsidyAmount.setScale(2, BigDecimal.ROUND_DOWN),mallMember.getId());
/**
* 生成直推返利的流水记录
@@ -209,6 +208,9 @@
* 2、返利对象：下单人的直推上级 10%，直推的直推 5%
* 3、金额：补贴金额乘以分享奖励的比例
*/
+ if(StrUtil.isEmpty(mallMember.getReferrerId())){
+ return;
+ }
//下单人的直推上级
MallMember mallMemberOne = memberMapper.selectInfoByInviteId(mallMember.getReferrerId());
//生成直推返利的流水记录
@@ -231,11 +233,7 @@
FlowTypeEnum.BALANCE.getValue(),
MallMoneyFlowTypeEnum.DIRECT_REWARD.getName()
);
-
-// memberWalletService.addBalance(directRewardAmount,mallMemberOne.getId());
-
- memberWalletService.add(directRewardAmount, mallMemberOne.getId(), "balance");
-
+ memberWalletService.addBalance(directRewardAmount,mallMemberOne.getId());
DataDictionaryCustom shareOneDic = dataDictionaryCustomMapper.selectDicDataByTypeAndCode(
DataDictionaryEnum.LEVEL_ONE.getType(),
DataDictionaryEnum.LEVEL_ONE.getCode()
@@ -254,8 +252,11 @@
FlowTypeEnum.BALANCE.getValue(),
MallMoneyFlowTypeEnum.SHARE_REWARD_ONE.getName()
);
-// memberWalletService.addBalance(shareOneAmount,mallMemberOne.getId());
- memberWalletService.add(shareOneAmount, mallMemberOne.getId(), "balance");
+ memberWalletService.addBalance(shareOneAmount,mallMemberOne.getId());
+ }
+
+ if(StrUtil.isEmpty(mallMemberOne.getReferrerId())){
+ return;
}
//下单人的直推上级的直推
MallMember mallMemberTwo = memberMapper.selectInfoByInviteId(mallMemberOne.getReferrerId());
@@ -277,12 +278,16 @@
FlowTypeEnum.BALANCE.getValue(),
MallMoneyFlowTypeEnum.SHARE_REWARD_TWO.getName()
);
-// memberWalletService.addBalance(shareTwoAmount,mallMemberTwo.getId());
- memberWalletService.add(shareTwoAmount, mallMemberTwo.getId(), "balance");
+ memberWalletService.addBalance(shareTwoAmount,mallMemberTwo.getId());
}
/**
* 团队管理补贴
*/
+
+
+ if(StrUtil.isEmpty(mallMember.getReferrerIds())){
+ return;
+ }
//下单人所有的上级
String referrerIds = mallMember.getReferrerIds();
List<String> refererIdList = StrUtil.split(referrerIds, ",", -1, true, true);
@@ -327,9 +332,7 @@
MallMoneyFlowTypeEnum.TEAM_REWARD.getName()
);
-// memberWalletService.addBalance(teamManageAmount,mallMemberUp.getId());
-
- memberWalletService.add(teamManageAmount, mallMemberUp.getId(), "balance");
+ memberWalletService.addBalance(teamManageAmount,mallMemberUp.getId());
}
levelStart = levelUp;
}
--
Gitblit v1.9.1