From 81b15e722dce6ff4cdf2dc4fba4f211f4dbfadbb Mon Sep 17 00:00:00 2001
From: xiaoyong931011 <15274802129@163.com>
Date: Tue, 10 Jan 2023 11:42:34 +0800
Subject: [PATCH] 20221227 充值归集

---
 src/test/java/cc/mrbird/febs/ProfitTest.java |   21 +++++++++++++++------
 1 files changed, 15 insertions(+), 6 deletions(-)

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