From 9935d4231a5346a77c9f8220c1be0524521f5cff Mon Sep 17 00:00:00 2001
From: xiaoyong931011 <15274802129@163.com>
Date: Mon, 09 Jan 2023 16:41:57 +0800
Subject: [PATCH] 20221227 充值归集

---
 src/main/java/cc/mrbird/febs/mall/service/impl/AgentServiceImpl.java |   19 +++++--------------
 src/main/resources/application-prod.yml                              |    2 +-
 2 files changed, 6 insertions(+), 15 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 e698103..9451987 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, mallMember.getId(), "balance");
+        memberWalletService.addBalance(subsidyAmount.setScale(2, BigDecimal.ROUND_DOWN),mallMember.getId());
 
         /**
          * 生成直推返利的流水记录
@@ -231,11 +230,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 +249,7 @@
                     FlowTypeEnum.BALANCE.getValue(),
                     MallMoneyFlowTypeEnum.SHARE_REWARD_ONE.getName()
             );
-//            memberWalletService.addBalance(shareOneAmount,mallMemberOne.getId());
-            memberWalletService.add(shareOneAmount, mallMemberOne.getId(), "balance");
+            memberWalletService.addBalance(shareOneAmount,mallMemberOne.getId());
         }
         //下单人的直推上级的直推
         MallMember mallMemberTwo = memberMapper.selectInfoByInviteId(mallMemberOne.getReferrerId());
@@ -277,8 +271,7 @@
                     FlowTypeEnum.BALANCE.getValue(),
                     MallMoneyFlowTypeEnum.SHARE_REWARD_TWO.getName()
             );
-//            memberWalletService.addBalance(shareTwoAmount,mallMemberTwo.getId());
-            memberWalletService.add(shareTwoAmount, mallMemberTwo.getId(), "balance");
+            memberWalletService.addBalance(shareTwoAmount,mallMemberTwo.getId());
         }
         /**
          * 团队管理补贴
@@ -327,9 +320,7 @@
                             MallMoneyFlowTypeEnum.TEAM_REWARD.getName()
                     );
 
-//                    memberWalletService.addBalance(teamManageAmount,mallMemberUp.getId());
-
-                    memberWalletService.add(teamManageAmount, mallMemberUp.getId(), "balance");
+                    memberWalletService.addBalance(teamManageAmount,mallMemberUp.getId());
                 }
                 levelStart = levelUp;
             }
diff --git a/src/main/resources/application-prod.yml b/src/main/resources/application-prod.yml
index 18a5f88..973ebd7 100644
--- a/src/main/resources/application-prod.yml
+++ b/src/main/resources/application-prod.yml
@@ -2,7 +2,7 @@
   datasource:
     dynamic:
       # 是否开启 SQL日志输出,生产环境建议关闭,有性能损耗
-      p6spy: false
+      p6spy: true
       hikari:
         connection-timeout: 30000
         max-lifetime: 1800000

--
Gitblit v1.9.1