From ae085ffd5e476ffc67cd05d12d6375f2f0f61cb3 Mon Sep 17 00:00:00 2001
From: xiaoyong931011 <15274802129@163.com>
Date: Fri, 11 Nov 2022 03:37:48 +0800
Subject: [PATCH] 20221021

---
 src/main/java/cc/mrbird/febs/dapp/service/impl/DappWalletServiceImpl.java |  197 ++++++++++++++++++++++++++++++-------------------
 1 files changed, 121 insertions(+), 76 deletions(-)

diff --git a/src/main/java/cc/mrbird/febs/dapp/service/impl/DappWalletServiceImpl.java b/src/main/java/cc/mrbird/febs/dapp/service/impl/DappWalletServiceImpl.java
index eb4514b..0aca67d 100644
--- a/src/main/java/cc/mrbird/febs/dapp/service/impl/DappWalletServiceImpl.java
+++ b/src/main/java/cc/mrbird/febs/dapp/service/impl/DappWalletServiceImpl.java
@@ -538,9 +538,12 @@
         }
 
 
-        DappMemberEntity dappMemberEntityOut = LoginUserUtil.getAppUser();
-        Long memberIdOut = dappMemberEntityOut.getId();
+//        DappMemberEntity dappMemberEntityOut = LoginUserUtil.getAppUser();
+        Long memberIdOut = LoginUserUtil.getAppUser().getId();
         //判断账户是否限制
+
+
+        DappMemberEntity dappMemberEntityOut = dappMemberDao.selectById(memberIdOut);
         Integer withdrawAble = dappMemberEntityOut.getWithdrawAble();
         if(2 == withdrawAble){
             return new FebsResponse().fail().message(MessageSourceUtils.getString("member_err_0017"));
@@ -594,7 +597,7 @@
          * 否则,计算收益占本金的比例。符合条件允许提现
          */
         //获取用户的总收益
-        BigDecimal totalProfitOut = igtOnHookPlanOrderItemdao.selectTotalProfitByMemberIdAndStateAndIsgoal(memberIdOut,1,2);
+        BigDecimal totalProfitOut = igtOnHookPlanOrderItemdao.selectTotalProfitByMemberIdAndStateAndIsgoal(memberIdOut,2);
         if(balance.compareTo(totalProfitOut) > 0){
             BigDecimal totalAmount = dappWalletCoinEntityOut.getTotalAmount();
             //用户总收益率
@@ -704,7 +707,7 @@
          * 否则,计算收益占本金的比例。符合条件允许提现
          */
         //获取用户的总收益
-        BigDecimal totalProfit = igtOnHookPlanOrderItemdao.selectTotalProfitByMemberIdAndStateAndIsgoal(memberId,1,2);
+        BigDecimal totalProfit = igtOnHookPlanOrderItemdao.selectTotalProfitByMemberIdAndStateAndIsgoal(memberId,2);
         if(balance.compareTo(totalProfit) >= 0){
             BigDecimal totalAmount = dappWalletCoinEntity.getTotalAmount();
             //用户总收益率
@@ -883,7 +886,7 @@
         return new FebsResponse().success().message(MessageSourceUtils.getString("Operation_001"));
     }
     @Override
-    public BigDecimal updateLSYJYLFC(List<String> refererIdList,BigDecimal totalProfit) {
+    public BigDecimal updateLSYJYLFC(List<String> refererIdList,BigDecimal totalProfit,long id) {
         //计算盈利分成
         BigDecimal profitSharingTotal = BigDecimal.ZERO;
         if(BigDecimal.ZERO.compareTo(totalProfit)>=0){
@@ -894,11 +897,14 @@
             if(!DataDictionaryEnum.LEVEL_IB.getCode().equals(LEVEL_IB)){
                 BigDecimal multiply = totalProfit.multiply(getProfitSharing(DataDictionaryEnum.LEVEL_IB.getCode()));
                 DappMemberEntity dappMemberEntityLEVEL_IB = dappMemberDao.selectMemberInfoByInviteId(LEVEL_IB);
-                dappWalletCoinDao.addTotalAndaddAvailableByMemberId(dappMemberEntityLEVEL_IB.getId(),multiply);
-                DappAccountMoneyChangeEntity dappAccountMoneyChangeEntity = new DappAccountMoneyChangeEntity(
-                        dappMemberEntityLEVEL_IB.getId(), multiply, "盈利分成", 8);
-                dappAccountMoneyChangeDao.insert(dappAccountMoneyChangeEntity);
-                profitSharingTotal = profitSharingTotal.add(multiply);
+                DappWalletCoinEntity dappWalletCoinEntity = dappWalletCoinDao.selectByMemberId(dappMemberEntityLEVEL_IB.getId());
+                if(AppContants.ONHOOK_BASIC_AMOUNT.compareTo(dappWalletCoinEntity.getAvailableAmount())<=0){
+                    dappWalletCoinDao.addTotalAndaddAvailableByMemberId(dappMemberEntityLEVEL_IB.getId(),multiply);
+                    DappAccountMoneyChangeEntity dappAccountMoneyChangeEntity = new DappAccountMoneyChangeEntity(
+                            dappMemberEntityLEVEL_IB.getId(), multiply, "盈利分成", 8,id);
+                    dappAccountMoneyChangeDao.insert(dappAccountMoneyChangeEntity);
+                    profitSharingTotal = profitSharingTotal.add(multiply);
+                }
             }
             String LEVEL_FIB = isIdentity(refererIdList, DataDictionaryEnum.LEVEL_FIB.getCode());
             if(!DataDictionaryEnum.LEVEL_FIB.getCode().equals(LEVEL_FIB)){
@@ -911,11 +917,14 @@
 
                 multiply = totalProfit.multiply(multiply);
                 DappMemberEntity dappMemberEntityLEVEL_FIB = dappMemberDao.selectMemberInfoByInviteId(LEVEL_FIB);
-                dappWalletCoinDao.addTotalAndaddAvailableByMemberId(dappMemberEntityLEVEL_FIB.getId(),multiply);
-                DappAccountMoneyChangeEntity dappAccountMoneyChangeEntity = new DappAccountMoneyChangeEntity(
-                        dappMemberEntityLEVEL_FIB.getId(), multiply, "盈利分成", 8);
-                dappAccountMoneyChangeDao.insert(dappAccountMoneyChangeEntity);
-                profitSharingTotal = profitSharingTotal.add(multiply);
+                DappWalletCoinEntity dappWalletCoinEntity = dappWalletCoinDao.selectByMemberId(dappMemberEntityLEVEL_FIB.getId());
+                if(AppContants.ONHOOK_BASIC_AMOUNT.compareTo(dappWalletCoinEntity.getAvailableAmount())<=0) {
+                    dappWalletCoinDao.addTotalAndaddAvailableByMemberId(dappMemberEntityLEVEL_FIB.getId(), multiply);
+                    DappAccountMoneyChangeEntity dappAccountMoneyChangeEntity = new DappAccountMoneyChangeEntity(
+                            dappMemberEntityLEVEL_FIB.getId(), multiply, "盈利分成", 8, id);
+                    dappAccountMoneyChangeDao.insert(dappAccountMoneyChangeEntity);
+                    profitSharingTotal = profitSharingTotal.add(multiply);
+                }
             }
             String LEVEL_CIB = isIdentity(refererIdList, DataDictionaryEnum.LEVEL_CIB.getCode());
             if(!DataDictionaryEnum.LEVEL_CIB.getCode().equals(LEVEL_CIB)){
@@ -929,11 +938,14 @@
                 }
                 multiply = totalProfit.multiply(multiply);
                 DappMemberEntity dappMemberEntityLEVEL_CIB = dappMemberDao.selectMemberInfoByInviteId(LEVEL_CIB);
-                dappWalletCoinDao.addTotalAndaddAvailableByMemberId(dappMemberEntityLEVEL_CIB.getId(),multiply);
-                DappAccountMoneyChangeEntity dappAccountMoneyChangeEntity = new DappAccountMoneyChangeEntity(
-                        dappMemberEntityLEVEL_CIB.getId(), multiply, "盈利分成", 8);
-                dappAccountMoneyChangeDao.insert(dappAccountMoneyChangeEntity);
-                profitSharingTotal = profitSharingTotal.add(multiply);
+                DappWalletCoinEntity dappWalletCoinEntity = dappWalletCoinDao.selectByMemberId(dappMemberEntityLEVEL_CIB.getId());
+                if(AppContants.ONHOOK_BASIC_AMOUNT.compareTo(dappWalletCoinEntity.getAvailableAmount())<=0) {
+                    dappWalletCoinDao.addTotalAndaddAvailableByMemberId(dappMemberEntityLEVEL_CIB.getId(), multiply);
+                    DappAccountMoneyChangeEntity dappAccountMoneyChangeEntity = new DappAccountMoneyChangeEntity(
+                            dappMemberEntityLEVEL_CIB.getId(), multiply, "盈利分成", 8, id);
+                    dappAccountMoneyChangeDao.insert(dappAccountMoneyChangeEntity);
+                    profitSharingTotal = profitSharingTotal.add(multiply);
+                }
             }
             String LEVEL_AIB = isIdentity(refererIdList, DataDictionaryEnum.LEVEL_AIB.getCode());
             if(!DataDictionaryEnum.LEVEL_AIB.getCode().equals(LEVEL_AIB)){
@@ -949,11 +961,14 @@
                 }
                 multiply = totalProfit.multiply(multiply);
                 DappMemberEntity dappMemberEntityLEVEL_AIB = dappMemberDao.selectMemberInfoByInviteId(LEVEL_AIB);
-                dappWalletCoinDao.addTotalAndaddAvailableByMemberId(dappMemberEntityLEVEL_AIB.getId(),multiply);
-                DappAccountMoneyChangeEntity dappAccountMoneyChangeEntity = new DappAccountMoneyChangeEntity(
-                        dappMemberEntityLEVEL_AIB.getId(), multiply, "盈利分成", 8);
-                dappAccountMoneyChangeDao.insert(dappAccountMoneyChangeEntity);
-                profitSharingTotal = profitSharingTotal.add(multiply);
+                DappWalletCoinEntity dappWalletCoinEntity = dappWalletCoinDao.selectByMemberId(dappMemberEntityLEVEL_AIB.getId());
+                if(AppContants.ONHOOK_BASIC_AMOUNT.compareTo(dappWalletCoinEntity.getAvailableAmount())<=0) {
+                    dappWalletCoinDao.addTotalAndaddAvailableByMemberId(dappMemberEntityLEVEL_AIB.getId(), multiply);
+                    DappAccountMoneyChangeEntity dappAccountMoneyChangeEntity = new DappAccountMoneyChangeEntity(
+                            dappMemberEntityLEVEL_AIB.getId(), multiply, "盈利分成", 8, id);
+                    dappAccountMoneyChangeDao.insert(dappAccountMoneyChangeEntity);
+                    profitSharingTotal = profitSharingTotal.add(multiply);
+                }
             }
             String LEVEL_GIB = isIdentity(refererIdList, DataDictionaryEnum.LEVEL_GIB.getCode());
             if(!DataDictionaryEnum.LEVEL_GIB.getCode().equals(LEVEL_GIB)){
@@ -971,11 +986,14 @@
                 }
                 multiply = totalProfit.multiply(multiply);
                 DappMemberEntity dappMemberEntityLEVEL_GIB = dappMemberDao.selectMemberInfoByInviteId(LEVEL_GIB);
-                dappWalletCoinDao.addTotalAndaddAvailableByMemberId(dappMemberEntityLEVEL_GIB.getId(),multiply);
-                DappAccountMoneyChangeEntity dappAccountMoneyChangeEntity = new DappAccountMoneyChangeEntity(
-                        dappMemberEntityLEVEL_GIB.getId(), multiply, "盈利分成", 8);
-                dappAccountMoneyChangeDao.insert(dappAccountMoneyChangeEntity);
-                profitSharingTotal = profitSharingTotal.add(multiply);
+                DappWalletCoinEntity dappWalletCoinEntity = dappWalletCoinDao.selectByMemberId(dappMemberEntityLEVEL_GIB.getId());
+                if(AppContants.ONHOOK_BASIC_AMOUNT.compareTo(dappWalletCoinEntity.getAvailableAmount())<=0) {
+                    dappWalletCoinDao.addTotalAndaddAvailableByMemberId(dappMemberEntityLEVEL_GIB.getId(), multiply);
+                    DappAccountMoneyChangeEntity dappAccountMoneyChangeEntity = new DappAccountMoneyChangeEntity(
+                            dappMemberEntityLEVEL_GIB.getId(), multiply, "盈利分成", 8, id);
+                    dappAccountMoneyChangeDao.insert(dappAccountMoneyChangeEntity);
+                    profitSharingTotal = profitSharingTotal.add(multiply);
+                }
             }
             String LEVEL_BP = isIdentity(refererIdList, DataDictionaryEnum.LEVEL_BP.getCode());
             if(!DataDictionaryEnum.LEVEL_BP.getCode().equals(LEVEL_BP)){
@@ -995,11 +1013,14 @@
                 }
                 multiply = totalProfit.multiply(multiply);
                 DappMemberEntity dappMemberEntityLEVEL_BP = dappMemberDao.selectMemberInfoByInviteId(LEVEL_BP);
-                dappWalletCoinDao.addTotalAndaddAvailableByMemberId(dappMemberEntityLEVEL_BP.getId(),multiply);
-                DappAccountMoneyChangeEntity dappAccountMoneyChangeEntity = new DappAccountMoneyChangeEntity(
-                        dappMemberEntityLEVEL_BP.getId(), multiply, "盈利分成", 8);
-                dappAccountMoneyChangeDao.insert(dappAccountMoneyChangeEntity);
-                profitSharingTotal = profitSharingTotal.add(multiply);
+                DappWalletCoinEntity dappWalletCoinEntity = dappWalletCoinDao.selectByMemberId(dappMemberEntityLEVEL_BP.getId());
+                if(AppContants.ONHOOK_BASIC_AMOUNT.compareTo(dappWalletCoinEntity.getAvailableAmount())<=0) {
+                    dappWalletCoinDao.addTotalAndaddAvailableByMemberId(dappMemberEntityLEVEL_BP.getId(), multiply);
+                    DappAccountMoneyChangeEntity dappAccountMoneyChangeEntity = new DappAccountMoneyChangeEntity(
+                            dappMemberEntityLEVEL_BP.getId(), multiply, "盈利分成", 8, id);
+                    dappAccountMoneyChangeDao.insert(dappAccountMoneyChangeEntity);
+                    profitSharingTotal = profitSharingTotal.add(multiply);
+                }
             }
             String LEVEL_SP = isIdentity(refererIdList, DataDictionaryEnum.LEVEL_SP.getCode());
             if(!DataDictionaryEnum.LEVEL_SP.getCode().equals(LEVEL_SP)){
@@ -1021,11 +1042,14 @@
                 }
                 multiply = totalProfit.multiply(multiply);
                 DappMemberEntity dappMemberEntityLEVEL_SP = dappMemberDao.selectMemberInfoByInviteId(LEVEL_SP);
-                dappWalletCoinDao.addTotalAndaddAvailableByMemberId(dappMemberEntityLEVEL_SP.getId(),multiply);
-                DappAccountMoneyChangeEntity dappAccountMoneyChangeEntity = new DappAccountMoneyChangeEntity(
-                        dappMemberEntityLEVEL_SP.getId(), multiply, "盈利分成", 8);
-                dappAccountMoneyChangeDao.insert(dappAccountMoneyChangeEntity);
-                profitSharingTotal = profitSharingTotal.add(multiply);
+                DappWalletCoinEntity dappWalletCoinEntity = dappWalletCoinDao.selectByMemberId(dappMemberEntityLEVEL_SP.getId());
+                if(AppContants.ONHOOK_BASIC_AMOUNT.compareTo(dappWalletCoinEntity.getAvailableAmount())<=0) {
+                    dappWalletCoinDao.addTotalAndaddAvailableByMemberId(dappMemberEntityLEVEL_SP.getId(), multiply);
+                    DappAccountMoneyChangeEntity dappAccountMoneyChangeEntity = new DappAccountMoneyChangeEntity(
+                            dappMemberEntityLEVEL_SP.getId(), multiply, "盈利分成", 8, id);
+                    dappAccountMoneyChangeDao.insert(dappAccountMoneyChangeEntity);
+                    profitSharingTotal = profitSharingTotal.add(multiply);
+                }
             }
             String LEVEL_GP = isIdentity(refererIdList, DataDictionaryEnum.LEVEL_GP.getCode());
             if(!DataDictionaryEnum.LEVEL_GP.getCode().equals(LEVEL_GP)){
@@ -1049,11 +1073,14 @@
                 }
                 multiply = totalProfit.multiply(multiply);
                 DappMemberEntity dappMemberEntityLEVEL_GP = dappMemberDao.selectMemberInfoByInviteId(LEVEL_GP);
-                dappWalletCoinDao.addTotalAndaddAvailableByMemberId(dappMemberEntityLEVEL_GP.getId(),multiply);
-                DappAccountMoneyChangeEntity dappAccountMoneyChangeEntity = new DappAccountMoneyChangeEntity(
-                        dappMemberEntityLEVEL_GP.getId(), multiply, "盈利分成", 8);
-                dappAccountMoneyChangeDao.insert(dappAccountMoneyChangeEntity);
-                profitSharingTotal = profitSharingTotal.add(multiply);
+                DappWalletCoinEntity dappWalletCoinEntity = dappWalletCoinDao.selectByMemberId(dappMemberEntityLEVEL_GP.getId());
+                if(AppContants.ONHOOK_BASIC_AMOUNT.compareTo(dappWalletCoinEntity.getAvailableAmount())<=0) {
+                    dappWalletCoinDao.addTotalAndaddAvailableByMemberId(dappMemberEntityLEVEL_GP.getId(), multiply);
+                    DappAccountMoneyChangeEntity dappAccountMoneyChangeEntity = new DappAccountMoneyChangeEntity(
+                            dappMemberEntityLEVEL_GP.getId(), multiply, "盈利分成", 8, id);
+                    dappAccountMoneyChangeDao.insert(dappAccountMoneyChangeEntity);
+                    profitSharingTotal = profitSharingTotal.add(multiply);
+                }
             }
 
 
@@ -1065,11 +1092,14 @@
                 BigDecimal multiply = totalProfit.multiply(getRunningCommission(DataDictionaryEnum.LEVEL_AIB.getCode()));
                 DappMemberEntity dappMemberEntityLEVEL_AIB = dappMemberDao.selectMemberInfoByInviteId(LEVEL_AIB);
 
-                dappWalletCoinDao.addTotalAndaddAvailableByMemberId(dappMemberEntityLEVEL_AIB.getId(),multiply);
-                DappAccountMoneyChangeEntity dappAccountMoneyChangeEntity = new DappAccountMoneyChangeEntity(
-                        dappMemberEntityLEVEL_AIB.getId(), multiply, "流水佣金", 7);
-                dappAccountMoneyChangeDao.insert(dappAccountMoneyChangeEntity);
-                profitSharingTotal = profitSharingTotal.add(multiply);
+                DappWalletCoinEntity dappWalletCoinEntity = dappWalletCoinDao.selectByMemberId(dappMemberEntityLEVEL_AIB.getId());
+                if(AppContants.ONHOOK_BASIC_AMOUNT.compareTo(dappWalletCoinEntity.getAvailableAmount())<=0) {
+                    dappWalletCoinDao.addTotalAndaddAvailableByMemberId(dappMemberEntityLEVEL_AIB.getId(), multiply);
+                    DappAccountMoneyChangeEntity dappAccountMoneyChangeEntity = new DappAccountMoneyChangeEntity(
+                            dappMemberEntityLEVEL_AIB.getId(), multiply, "流水佣金", 7, id);
+                    dappAccountMoneyChangeDao.insert(dappAccountMoneyChangeEntity);
+                    profitSharingTotal = profitSharingTotal.add(multiply);
+                }
             }
 
             String LEVEL_GIB = isIdentity(refererIdList, DataDictionaryEnum.LEVEL_GIB.getCode());
@@ -1077,11 +1107,14 @@
                 BigDecimal multiply = totalProfit.multiply(getRunningCommission(DataDictionaryEnum.LEVEL_GIB.getCode()));
                 DappMemberEntity dappMemberEntityLEVEL_GIB = dappMemberDao.selectMemberInfoByInviteId(LEVEL_GIB);
 
-                dappWalletCoinDao.addTotalAndaddAvailableByMemberId(dappMemberEntityLEVEL_GIB.getId(),multiply);
-                DappAccountMoneyChangeEntity dappAccountMoneyChangeEntity = new DappAccountMoneyChangeEntity(
-                        dappMemberEntityLEVEL_GIB.getId(), multiply, "流水佣金", 7);
-                dappAccountMoneyChangeDao.insert(dappAccountMoneyChangeEntity);
-                profitSharingTotal = profitSharingTotal.add(multiply);
+                DappWalletCoinEntity dappWalletCoinEntity = dappWalletCoinDao.selectByMemberId(dappMemberEntityLEVEL_GIB.getId());
+                if(AppContants.ONHOOK_BASIC_AMOUNT.compareTo(dappWalletCoinEntity.getAvailableAmount())<=0) {
+                    dappWalletCoinDao.addTotalAndaddAvailableByMemberId(dappMemberEntityLEVEL_GIB.getId(), multiply);
+                    DappAccountMoneyChangeEntity dappAccountMoneyChangeEntity = new DappAccountMoneyChangeEntity(
+                            dappMemberEntityLEVEL_GIB.getId(), multiply, "流水佣金", 7, id);
+                    dappAccountMoneyChangeDao.insert(dappAccountMoneyChangeEntity);
+                    profitSharingTotal = profitSharingTotal.add(multiply);
+                }
             }
 
             String LEVEL_BP = isIdentity(refererIdList, DataDictionaryEnum.LEVEL_BP.getCode());
@@ -1089,11 +1122,14 @@
                 BigDecimal multiply = totalProfit.multiply(getRunningCommission(DataDictionaryEnum.LEVEL_BP.getCode()));
                 DappMemberEntity dappMemberEntityLEVEL_BP = dappMemberDao.selectMemberInfoByInviteId(LEVEL_BP);
 
-                dappWalletCoinDao.addTotalAndaddAvailableByMemberId(dappMemberEntityLEVEL_BP.getId(),multiply);
-                DappAccountMoneyChangeEntity dappAccountMoneyChangeEntity = new DappAccountMoneyChangeEntity(
-                        dappMemberEntityLEVEL_BP.getId(), multiply, "流水佣金", 7);
-                dappAccountMoneyChangeDao.insert(dappAccountMoneyChangeEntity);
-                profitSharingTotal = profitSharingTotal.add(multiply);
+                DappWalletCoinEntity dappWalletCoinEntity = dappWalletCoinDao.selectByMemberId(dappMemberEntityLEVEL_BP.getId());
+                if(AppContants.ONHOOK_BASIC_AMOUNT.compareTo(dappWalletCoinEntity.getAvailableAmount())<=0) {
+                    dappWalletCoinDao.addTotalAndaddAvailableByMemberId(dappMemberEntityLEVEL_BP.getId(), multiply);
+                    DappAccountMoneyChangeEntity dappAccountMoneyChangeEntity = new DappAccountMoneyChangeEntity(
+                            dappMemberEntityLEVEL_BP.getId(), multiply, "流水佣金", 7, id);
+                    dappAccountMoneyChangeDao.insert(dappAccountMoneyChangeEntity);
+                    profitSharingTotal = profitSharingTotal.add(multiply);
+                }
             }
 
             String LEVEL_SP = isIdentity(refererIdList, DataDictionaryEnum.LEVEL_SP.getCode());
@@ -1101,11 +1137,14 @@
                 BigDecimal multiply = totalProfit.multiply(getRunningCommission(DataDictionaryEnum.LEVEL_SP.getCode()));
                 DappMemberEntity dappMemberEntityLEVEL_SP = dappMemberDao.selectMemberInfoByInviteId(LEVEL_SP);
 
-                dappWalletCoinDao.addTotalAndaddAvailableByMemberId(dappMemberEntityLEVEL_SP.getId(),multiply);
-                DappAccountMoneyChangeEntity dappAccountMoneyChangeEntity = new DappAccountMoneyChangeEntity(
-                        dappMemberEntityLEVEL_SP.getId(), multiply, "流水佣金", 7);
-                dappAccountMoneyChangeDao.insert(dappAccountMoneyChangeEntity);
-                profitSharingTotal = profitSharingTotal.add(multiply);
+                DappWalletCoinEntity dappWalletCoinEntity = dappWalletCoinDao.selectByMemberId(dappMemberEntityLEVEL_SP.getId());
+                if(AppContants.ONHOOK_BASIC_AMOUNT.compareTo(dappWalletCoinEntity.getAvailableAmount())<=0) {
+                    dappWalletCoinDao.addTotalAndaddAvailableByMemberId(dappMemberEntityLEVEL_SP.getId(), multiply);
+                    DappAccountMoneyChangeEntity dappAccountMoneyChangeEntity = new DappAccountMoneyChangeEntity(
+                            dappMemberEntityLEVEL_SP.getId(), multiply, "流水佣金", 7, id);
+                    dappAccountMoneyChangeDao.insert(dappAccountMoneyChangeEntity);
+                    profitSharingTotal = profitSharingTotal.add(multiply);
+                }
             }
 
             String LEVEL_GP = isIdentity(refererIdList, DataDictionaryEnum.LEVEL_GP.getCode());
@@ -1113,26 +1152,28 @@
                 BigDecimal multiply = totalProfit.multiply(getRunningCommission(DataDictionaryEnum.LEVEL_GP.getCode()));
                 DappMemberEntity dappMemberEntityLEVEL_GP = dappMemberDao.selectMemberInfoByInviteId(LEVEL_GP);
 
-                dappWalletCoinDao.addTotalAndaddAvailableByMemberId(dappMemberEntityLEVEL_GP.getId(),multiply);
-                DappAccountMoneyChangeEntity dappAccountMoneyChangeEntity = new DappAccountMoneyChangeEntity(
-                        dappMemberEntityLEVEL_GP.getId(), multiply, "流水佣金", 7);
-                dappAccountMoneyChangeDao.insert(dappAccountMoneyChangeEntity);
-                profitSharingTotal = profitSharingTotal.add(multiply);
+                DappWalletCoinEntity dappWalletCoinEntity = dappWalletCoinDao.selectByMemberId(dappMemberEntityLEVEL_GP.getId());
+                if(AppContants.ONHOOK_BASIC_AMOUNT.compareTo(dappWalletCoinEntity.getAvailableAmount())<=0) {
+                    dappWalletCoinDao.addTotalAndaddAvailableByMemberId(dappMemberEntityLEVEL_GP.getId(), multiply);
+                    DappAccountMoneyChangeEntity dappAccountMoneyChangeEntity = new DappAccountMoneyChangeEntity(
+                            dappMemberEntityLEVEL_GP.getId(), multiply, "流水佣金", 7, id);
+                    dappAccountMoneyChangeDao.insert(dappAccountMoneyChangeEntity);
+                    profitSharingTotal = profitSharingTotal.add(multiply);
+                }
             }
         }
         return profitSharingTotal;
     }
 
     @Override
-    public BigDecimal updatePTFC(Long memberId, BigDecimal totalProfit) {
+    public BigDecimal updatePTFC(Long memberId, BigDecimal totalProfit,long id) {
         if(BigDecimal.ZERO.compareTo(totalProfit)>=0){
             return BigDecimal.ZERO;
         }
-        BigDecimal multiply = totalProfit.multiply(new BigDecimal(0.05));
         DappAccountMoneyChangeEntity dappAccountMoneyChangeEntity = new DappAccountMoneyChangeEntity(65L,
-                multiply.negate(), "系统", 9);
+                totalProfit, "系统", 9,id);
         dappAccountMoneyChangeDao.insert(dappAccountMoneyChangeEntity);
-        return multiply;
+        return totalProfit;
     }
 
     @Override
@@ -1152,8 +1193,12 @@
 
     public static void main(String[] args) {
 
-        String num = StrUtil.subSuf("01234",1);
-        System.out.print(num);
+        DateTime date = DateUtil.date();
+        DateTime endTime = DateUtil.parseTimeToday("09:08:03");
+        if(DateUtil.compare(date,endTime)>=0){
+            //
+            System.out.print(endTime);
+        }
     }
 
     private String isIdentity(List<String> refererIds,String levelCode){

--
Gitblit v1.9.1