From 615b4cba39cc01756d7c0299204cc6ecaf172be5 Mon Sep 17 00:00:00 2001 From: xiaoyong931011 <15274802129@163.com> Date: Mon, 09 Jan 2023 16:11:38 +0800 Subject: [PATCH] 20221227 充值归集 --- src/main/java/cc/mrbird/febs/mall/service/impl/AgentServiceImpl.java | 19 ++++++++++++++----- src/test/java/cc/mrbird/febs/ProfitTest.java | 21 +++++++++++++++------ 2 files changed, 29 insertions(+), 11 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 9451987..73282bc 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,7 +194,8 @@ MallMoneyFlowTypeEnum.MARKET_SUBSIDIES.getName() ); - memberWalletService.addBalance(subsidyAmount.setScale(2, BigDecimal.ROUND_DOWN),mallMember.getId()); +// memberWalletService.addBalance(subsidyAmount.setScale(4, BigDecimal.ROUND_DOWN),mallMember.getId()); + memberWalletService.add(subsidyAmount.setScale(4, BigDecimal.ROUND_DOWN), mallMember.getId(), "balance"); /** * 生成直推返利的流水记录 @@ -230,7 +231,11 @@ FlowTypeEnum.BALANCE.getValue(), MallMoneyFlowTypeEnum.DIRECT_REWARD.getName() ); - memberWalletService.addBalance(directRewardAmount,mallMemberOne.getId()); + +// memberWalletService.addBalance(directRewardAmount,mallMemberOne.getId()); + + memberWalletService.add(directRewardAmount, mallMemberOne.getId(), "balance"); + DataDictionaryCustom shareOneDic = dataDictionaryCustomMapper.selectDicDataByTypeAndCode( DataDictionaryEnum.LEVEL_ONE.getType(), DataDictionaryEnum.LEVEL_ONE.getCode() @@ -249,7 +254,8 @@ FlowTypeEnum.BALANCE.getValue(), MallMoneyFlowTypeEnum.SHARE_REWARD_ONE.getName() ); - memberWalletService.addBalance(shareOneAmount,mallMemberOne.getId()); +// memberWalletService.addBalance(shareOneAmount,mallMemberOne.getId()); + memberWalletService.add(shareOneAmount, mallMemberOne.getId(), "balance"); } //下单人的直推上级的直推 MallMember mallMemberTwo = memberMapper.selectInfoByInviteId(mallMemberOne.getReferrerId()); @@ -271,7 +277,8 @@ FlowTypeEnum.BALANCE.getValue(), MallMoneyFlowTypeEnum.SHARE_REWARD_TWO.getName() ); - memberWalletService.addBalance(shareTwoAmount,mallMemberTwo.getId()); +// memberWalletService.addBalance(shareTwoAmount,mallMemberTwo.getId()); + memberWalletService.add(shareTwoAmount, mallMemberTwo.getId(), "balance"); } /** * 团队管理补贴 @@ -320,7 +327,9 @@ MallMoneyFlowTypeEnum.TEAM_REWARD.getName() ); - memberWalletService.addBalance(teamManageAmount,mallMemberUp.getId()); +// memberWalletService.addBalance(teamManageAmount,mallMemberUp.getId()); + + memberWalletService.add(teamManageAmount, mallMemberUp.getId(), "balance"); } levelStart = levelUp; } diff --git a/src/test/java/cc/mrbird/febs/ProfitTest.java b/src/test/java/cc/mrbird/febs/ProfitTest.java index 05c3c10..a702b5b 100644 --- a/src/test/java/cc/mrbird/febs/ProfitTest.java +++ b/src/test/java/cc/mrbird/febs/ProfitTest.java @@ -105,7 +105,7 @@ @Test public void directorProfitTest() { - Long directRewardId = 607L; + Long directRewardId = 628L; MallOrderInfo orderInfo = mallOrderInfoMapper.selectById(directRewardId); if(ObjectUtil.isEmpty(orderInfo)){ return; @@ -137,7 +137,8 @@ MallMoneyFlowTypeEnum.MARKET_SUBSIDIES.getName() ); - memberWalletService.addBalance(subsidyAmount.setScale(2, BigDecimal.ROUND_DOWN),mallMember.getId()); +// memberWalletService.addBalance(subsidyAmount.setScale(4, BigDecimal.ROUND_DOWN),mallMember.getId()); + memberWalletService.add(subsidyAmount.setScale(4, BigDecimal.ROUND_DOWN), mallMember.getId(), "balance"); /** * 生成直推返利的流水记录 @@ -173,7 +174,11 @@ FlowTypeEnum.BALANCE.getValue(), MallMoneyFlowTypeEnum.DIRECT_REWARD.getName() ); - memberWalletService.addBalance(directRewardAmount,mallMemberOne.getId()); + +// memberWalletService.addBalance(directRewardAmount,mallMemberOne.getId()); + + memberWalletService.add(directRewardAmount, mallMemberOne.getId(), "balance"); + DataDictionaryCustom shareOneDic = dataDictionaryCustomMapper.selectDicDataByTypeAndCode( DataDictionaryEnum.LEVEL_ONE.getType(), DataDictionaryEnum.LEVEL_ONE.getCode() @@ -192,7 +197,8 @@ FlowTypeEnum.BALANCE.getValue(), MallMoneyFlowTypeEnum.SHARE_REWARD_ONE.getName() ); - memberWalletService.addBalance(shareOneAmount,mallMemberOne.getId()); +// memberWalletService.addBalance(shareOneAmount,mallMemberOne.getId()); + memberWalletService.add(shareOneAmount, mallMemberOne.getId(), "balance"); } //下单人的直推上级的直推 MallMember mallMemberTwo = memberMapper.selectInfoByInviteId(mallMemberOne.getReferrerId()); @@ -214,7 +220,8 @@ FlowTypeEnum.BALANCE.getValue(), MallMoneyFlowTypeEnum.SHARE_REWARD_TWO.getName() ); - memberWalletService.addBalance(shareTwoAmount,mallMemberTwo.getId()); +// memberWalletService.addBalance(shareTwoAmount,mallMemberTwo.getId()); + memberWalletService.add(shareTwoAmount, mallMemberTwo.getId(), "balance"); } /** * 团队管理补贴 @@ -263,7 +270,9 @@ MallMoneyFlowTypeEnum.TEAM_REWARD.getName() ); - memberWalletService.addBalance(teamManageAmount,mallMemberUp.getId()); +// memberWalletService.addBalance(teamManageAmount,mallMemberUp.getId()); + + memberWalletService.add(teamManageAmount, mallMemberUp.getId(), "balance"); } levelStart = levelUp; } -- Gitblit v1.9.1