From ae4c7a173d4eaacd4adb2028414997463f8bee83 Mon Sep 17 00:00:00 2001
From: xiaoyong931011 <15274802129@163.com>
Date: Tue, 15 Nov 2022 11:29:27 +0800
Subject: [PATCH] 20221114,分级奖励判断时,增加了是否挂机判断

---
 src/main/java/cc/mrbird/febs/dapp/service/impl/DappWalletServiceImpl.java |  415 ++++++++++++++++++++++++++++++++++++++++++++++------------
 1 files changed, 325 insertions(+), 90 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 1acda06..c602b75 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
@@ -19,15 +19,15 @@
 import cc.mrbird.febs.dapp.service.DappSystemService;
 import cc.mrbird.febs.dapp.service.DappWalletService;
 import cc.mrbird.febs.dapp.utils.BoxUtil;
-import cc.mrbird.febs.dapp.vo.ActiveNftListVo;
-import cc.mrbird.febs.dapp.vo.ApiMemberWalletCoinVo;
-import cc.mrbird.febs.dapp.vo.WalletInfoVo;
+import cc.mrbird.febs.dapp.vo.*;
+import cc.mrbird.febs.rabbit.producer.UsdtUpdateProducer;
 import cn.hutool.core.collection.CollUtil;
 import cn.hutool.core.date.DateField;
 import cn.hutool.core.date.DateTime;
 import cn.hutool.core.date.DateUnit;
 import cn.hutool.core.date.DateUtil;
 import cn.hutool.core.util.ObjectUtil;
+import cn.hutool.core.util.StrUtil;
 import cn.hutool.crypto.SecureUtil;
 import cn.hutool.json.JSONUtil;
 import com.baomidou.mybatisplus.core.conditions.Wrapper;
@@ -67,6 +67,8 @@
     private final DappMemberService dappMemberService;
     private final MemberCoinWithdrawDao memberCoinWithdrawDao;
     private final IgtOnHookPlanOrderItemDao igtOnHookPlanOrderItemdao;
+    private final DappBankDao dappBankDao;
+    private final UsdtUpdateProducer usdtUpdateProducer;
 
     private final RedisTemplate<String, Object> redisTemplate;
 
@@ -536,8 +538,16 @@
         }
 
 
-        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"));
+        }
         //判断双方是否是会员
         if(ObjectUtil.isEmpty(dappMemberEntityOut.getInviteId())){
             return new FebsResponse().fail().message(MessageSourceUtils.getString("member_err_002"));
@@ -587,11 +597,11 @@
          * 否则,计算收益占本金的比例。符合条件允许提现
          */
         //获取用户的总收益
-        BigDecimal totalProfitOut = igtOnHookPlanOrderItemdao.selectTotalProfitByMemberIdAndStateAndIsgoal(memberIdOut,1,2);
+        BigDecimal totalProfitOut = igtOnHookPlanOrderItemdao.selectTotalProfitByMemberIdAndStateAndIsgoal(memberIdOut,2);
         if(balance.compareTo(totalProfitOut) > 0){
             BigDecimal totalAmount = dappWalletCoinEntityOut.getTotalAmount();
             //用户总收益率
-            BigDecimal divide = totalProfitOut.divide(totalAmount);
+            BigDecimal divide = totalProfitOut.divide(totalAmount,4,BigDecimal.ROUND_DOWN);
             //提现条件收益率
             DataDictionaryCustom outAccountProfitDic = dataDictionaryCustomMapper.selectDicDataByTypeAndCode(DataDictionaryEnum.OUT_ACCOUNT_PROFIT.getType(), DataDictionaryEnum.OUT_ACCOUNT_PROFIT.getCode());
             BigDecimal outAccountProfit = outAccountProfitDic.getValue() == null ? new BigDecimal("0.3") : new BigDecimal(outAccountProfitDic.getValue());
@@ -602,9 +612,9 @@
         //提现次数
         DataDictionaryCustom withdrawTimesDic = dataDictionaryCustomMapper.selectDicDataByTypeAndCode(DataDictionaryEnum.WITHDRAW_TIMES.getType(), DataDictionaryEnum.WITHDRAW_TIMES.getCode());
         Integer withdrawTimes = Integer.parseInt(withdrawTimesDic.getValue());
-        Integer withdrawTimesReal = memberCoinWithdrawDao.selectByMemberIdAndCreateTime(memberIdOut,DateUtil.format(DateUtil.date(),"yyyy-MM-dd"));
+        Integer withdrawTimesReal = memberCoinWithdrawDao.selectByMemberIdAndCreateTime(memberIdOut,DateUtil.format(DateUtil.date(),"yyyy-MM-dd"),"Y");
         if(withdrawTimesReal >= withdrawTimes){
-            return new FebsResponse().fail().message(MessageSourceUtils.getString("member_err_004"));
+            return new FebsResponse().fail().message(MessageSourceUtils.getString("member_err_0016"));
         }
         //转出账户,余额减少,冻结增加
         Integer countOut = dappWalletCoinDao.addFrozenAndDelAvailableById(dappWalletCoinEntityOut.getId(), balance);
@@ -618,9 +628,55 @@
         memberCoinWithdrawEntity.setFeeAmount(BigDecimal.ZERO);
         memberCoinWithdrawEntity.setSymbol("USDT");
         memberCoinWithdrawEntity.setMemberId(memberIdOut);
-        memberCoinWithdrawEntity.setStatus(MemberCoinWithdrawEntity.STATUS_DOING);
+        memberCoinWithdrawEntity.setStatus(MemberCoinWithdrawEntity.STATUS_YES);
         memberCoinWithdrawEntity.setIsInside(MemberCoinWithdrawEntity.ISINSIDE_YES);
         memberCoinWithdrawDao.insert(memberCoinWithdrawEntity);
+
+//        usdtUpdateProducer.sendMemberCoinInside(memberCoinWithdrawEntity.getId());
+        //转出账户,总额减少,冻结减少
+        dappWalletCoinDao.delTotalAndDelFrozenById(dappWalletCoinEntityOut.getId(),balance);
+
+        String isInside = memberCoinWithdrawEntity.getIsInside();
+        String content = "";
+        Integer type = 0;
+        if(MemberCoinWithdrawEntity.ISINSIDE_NO.equals(isInside)){
+            content = "提现";
+            type = 2;
+        }else{
+            content = "转账";
+            type = 4;
+        }
+        //转出账户生成一条账户资金变化记录
+        DappAccountMoneyChangeEntity dappAccountMoneyChangeEntityOut = new DappAccountMoneyChangeEntity(memberIdOut,
+                dappWalletCoinEntityOut.getTotalAmount().setScale(4,BigDecimal.ROUND_DOWN),
+                balance.negate(),
+                dappWalletCoinEntityOut.getTotalAmount().setScale(4,BigDecimal.ROUND_DOWN).subtract(balance),
+                content,
+                type);
+        dappAccountMoneyChangeDao.insert(dappAccountMoneyChangeEntityOut);
+
+        //转入账户,总额增加,余额增加
+        //转账
+        if(MemberCoinWithdrawEntity.ISINSIDE_YES.equals(isInside)){
+            String addressIn = memberCoinWithdrawEntity.getAddress();
+            DappMemberEntity dappMemberEntityIn = dappMemberDao.selectMemberInfoByInviteId(addressIn);
+            if(ObjectUtil.isEmpty(dappMemberEntityIn)){
+                throw new FebsException(MessageSourceUtils.getString("Operation_002"));
+            }
+            DappWalletCoinEntity dappWalletCoinEntityIn = dappWalletCoinDao.selectByMemberId(dappMemberEntityIn.getId());
+            Integer countIn = dappWalletCoinDao.addTotalAndaddAvailableById(dappWalletCoinEntityIn.getId(), memberCoinWithdrawEntity.getAmount());
+            if(1 != countIn){
+                throw new FebsException(MessageSourceUtils.getString("Operation_002"));
+            }
+            //生成流水记录
+            DappAccountMoneyChangeEntity dappAccountMoneyChangeEntityIn = new DappAccountMoneyChangeEntity(dappMemberEntityIn.getId(),
+                    dappWalletCoinEntityIn.getTotalAmount().setScale(4,BigDecimal.ROUND_DOWN),
+                    balance,
+                    dappWalletCoinEntityIn.getTotalAmount().setScale(4,BigDecimal.ROUND_DOWN).add(balance),
+                    "转账",
+                    4);
+            dappAccountMoneyChangeDao.insert(dappAccountMoneyChangeEntityIn);
+        }
         return new FebsResponse().success().message(MessageSourceUtils.getString("Operation_001"));
     }
 
@@ -668,12 +724,24 @@
         if(BigDecimal.ZERO.compareTo(balance) >= 0){
             return new FebsResponse().fail().message(MessageSourceUtils.getString("balance_err_001"));
         }
+        DataDictionaryCustom withDrawDic = dataDictionaryCustomMapper.selectDicDataByTypeAndCode(DataDictionaryEnum.WITHDRAW_MAX.getType()
+                , DataDictionaryEnum.WITHDRAW_MAX.getCode());
+        BigDecimal withDrawMax = withDrawDic.getValue() == null ? new BigDecimal("100") : new BigDecimal(withDrawDic.getValue());
+        if(withDrawMax.compareTo(balance) > 0){
+            return new FebsResponse().fail().message(MessageSourceUtils.getString("balance_err_003"));
+        }
         DappWalletCoinEntity dappWalletCoinEntity = dappWalletCoinDao.selectByMemberId(memberId);
         BigDecimal availableAmount = dappWalletCoinEntity.getAvailableAmount();
         if(balance.compareTo(availableAmount) > 0){
             return new FebsResponse().fail().message(MessageSourceUtils.getString("balance_err_002"));
         }
 
+        DappMemberEntity dappMemberEntityOut = dappMemberDao.selectById(memberId);
+        //判断账户是否限制
+        Integer withdrawAble = dappMemberEntityOut.getWithdrawAble();
+        if(2 == withdrawAble){
+            return new FebsResponse().fail().message(MessageSourceUtils.getString("member_err_0017"));
+        }
         //验证资金密码
         Boolean aBoolean = dappMemberService.validateTransferCode(apiTransferOutsideDto.getTransferCode(), memberId);
         if(!aBoolean){
@@ -685,11 +753,11 @@
          * 否则,计算收益占本金的比例。符合条件允许提现
          */
         //获取用户的总收益
-        BigDecimal totalProfit = igtOnHookPlanOrderItemdao.selectTotalProfitByMemberIdAndStateAndIsgoal(memberId,1,2);
+        BigDecimal totalProfit = igtOnHookPlanOrderItemdao.selectTotalProfitByMemberIdAndStateAndIsgoal(memberId,2);
         if(balance.compareTo(totalProfit) >= 0){
             BigDecimal totalAmount = dappWalletCoinEntity.getTotalAmount();
             //用户总收益率
-            BigDecimal divide = totalProfit.divide(totalAmount);
+            BigDecimal divide = totalProfit.divide(totalAmount,4,BigDecimal.ROUND_DOWN);
             //提现条件收益率
             DataDictionaryCustom outAccountProfitDic = dataDictionaryCustomMapper.selectDicDataByTypeAndCode(DataDictionaryEnum.OUT_ACCOUNT_PROFIT.getType(), DataDictionaryEnum.OUT_ACCOUNT_PROFIT.getCode());
             BigDecimal outAccountProfit = outAccountProfitDic.getValue() == null ? new BigDecimal("0.3") : new BigDecimal(outAccountProfitDic.getValue());
@@ -698,26 +766,32 @@
             }
         }
         //(2)每24小时只能提现一次
-        Integer withdrawTimesReal = memberCoinWithdrawDao.selectByMemberIdAndCreateTime(memberId,DateUtil.format(DateUtil.date(),"yyyy-MM-dd"));
-        if(1 > withdrawTimesReal){
+        // 提现次数
+        DataDictionaryCustom withdrawOutTimesDic = dataDictionaryCustomMapper.selectDicDataByTypeAndCode(DataDictionaryEnum.WITHDRAW_OUT_TIMES.getType()
+                , DataDictionaryEnum.WITHDRAW_OUT_TIMES.getCode());
+        String withdrawOutTimesStr = withdrawOutTimesDic.getValue() == null ? "1" : withdrawOutTimesDic.getValue();
+        int withdrawOutTimes = Integer.parseInt(withdrawOutTimesStr);
+        Integer withdrawTimesReal = memberCoinWithdrawDao.selectByMemberIdAndCreateTime(memberId,DateUtil.format(DateUtil.date(),"yyyy-MM-dd"),"N");
+        if(withdrawOutTimes <= withdrawTimesReal){
             return new FebsResponse().fail().message(MessageSourceUtils.getString("member_err_0014"));
         }
 
         //余额减少冻结增加
-        Integer count = dappWalletCoinDao.addFrozenAndDelAvailableById(memberId, balance);
+        Integer count = dappWalletCoinDao.addFrozenAndDelAvailableById(dappWalletCoinEntity.getId(), balance);
         if(1 != count){
             throw new FebsException(MessageSourceUtils.getString("balance_err_002"));
         }
         DataDictionaryCustom serviceFeeDic = dataDictionaryCustomMapper.selectDicDataByTypeAndCode(DataDictionaryEnum.SERVICE_FEE.getType(), DataDictionaryEnum.SERVICE_FEE.getCode());
         BigDecimal serviceFee = new BigDecimal(serviceFeeDic.getValue());
 
-        //转出账户生成一条内部转账记录
+        //转出账户生成一条记录
         MemberCoinWithdrawEntity memberCoinWithdrawEntity = new MemberCoinWithdrawEntity();
         memberCoinWithdrawEntity.setAddress(address);
         memberCoinWithdrawEntity.setAmount(balance);
         memberCoinWithdrawEntity.setFeeAmount(serviceFee);
         if(1 == apiTransferOutsideDto.getType()){
-            memberCoinWithdrawEntity.setTag("银行卡");
+            DappBank dappBank = dappBankDao.selectBankListByMemberIdAndBankNo(memberId, address);
+            memberCoinWithdrawEntity.setTag(dappBank.getMemberName()+"-银行卡");
             memberCoinWithdrawEntity.setSymbol("$");
         }else{
             memberCoinWithdrawEntity.setTag("钱包");
@@ -858,20 +932,27 @@
         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){
+            return profitSharingTotal;
+        }
         if(CollUtil.isNotEmpty(refererIdList)){
             String LEVEL_IB = isIdentity(refererIdList, DataDictionaryEnum.LEVEL_IB.getCode());
             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.addTotalAndaddAvailableById(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
+                    || 2 != dappMemberEntityLEVEL_IB.getIsOnHook()){
+                    dappWalletCoinDao.addTotalAndaddAvailableByMemberId(dappMemberEntityLEVEL_IB.getId(),multiply);
+                    DappAccountMoneyChangeEntity dappAccountMoneyChangeEntity = new DappAccountMoneyChangeEntity(
+                            dappMemberEntityLEVEL_IB.getId(),dappWalletCoinEntity.getAvailableAmount(),
+                            multiply, dappWalletCoinEntity.getAvailableAmount().add(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)){
@@ -884,107 +965,184 @@
 
                 multiply = totalProfit.multiply(multiply);
                 DappMemberEntity dappMemberEntityLEVEL_FIB = dappMemberDao.selectMemberInfoByInviteId(LEVEL_FIB);
-                dappWalletCoinDao.addTotalAndaddAvailableById(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
+                        || 2 != dappMemberEntityLEVEL_FIB.getIsOnHook()){
+                    dappWalletCoinDao.addTotalAndaddAvailableByMemberId(dappMemberEntityLEVEL_FIB.getId(), multiply);
+                    DappAccountMoneyChangeEntity dappAccountMoneyChangeEntity = new DappAccountMoneyChangeEntity(
+                            dappMemberEntityLEVEL_FIB.getId(),dappWalletCoinEntity.getAvailableAmount(),
+                            multiply, dappWalletCoinEntity.getAvailableAmount().add(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)){
                 BigDecimal multiply = BigDecimal.ZERO;
                 if(!DataDictionaryEnum.LEVEL_FIB.getCode().equals(LEVEL_FIB)){
                     multiply = getProfitSharing(DataDictionaryEnum.LEVEL_CIB.getCode()).subtract(getProfitSharing(DataDictionaryEnum.LEVEL_FIB.getCode()));
+                }else if(!DataDictionaryEnum.LEVEL_IB.getCode().equals(LEVEL_IB)){
+                    multiply = getProfitSharing(DataDictionaryEnum.LEVEL_CIB.getCode()).subtract(getProfitSharing(DataDictionaryEnum.LEVEL_IB.getCode()));
                 }else{
                     multiply = getProfitSharing(DataDictionaryEnum.LEVEL_CIB.getCode());
                 }
                 multiply = totalProfit.multiply(multiply);
                 DappMemberEntity dappMemberEntityLEVEL_CIB = dappMemberDao.selectMemberInfoByInviteId(LEVEL_CIB);
-                dappWalletCoinDao.addTotalAndaddAvailableById(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
+                        || 2 != dappMemberEntityLEVEL_CIB.getIsOnHook()){
+                    dappWalletCoinDao.addTotalAndaddAvailableByMemberId(dappMemberEntityLEVEL_CIB.getId(), multiply);
+                    DappAccountMoneyChangeEntity dappAccountMoneyChangeEntity = new DappAccountMoneyChangeEntity(
+                            dappMemberEntityLEVEL_CIB.getId(),dappWalletCoinEntity.getAvailableAmount(),
+                            multiply, dappWalletCoinEntity.getAvailableAmount().add(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)){
                 BigDecimal multiply = BigDecimal.ZERO;
                 if(!DataDictionaryEnum.LEVEL_CIB.getCode().equals(LEVEL_CIB)){
                     multiply = getProfitSharing(DataDictionaryEnum.LEVEL_AIB.getCode()).subtract(getProfitSharing(DataDictionaryEnum.LEVEL_CIB.getCode()));
+                }else if(!DataDictionaryEnum.LEVEL_FIB.getCode().equals(LEVEL_FIB)){
+                    multiply = getProfitSharing(DataDictionaryEnum.LEVEL_AIB.getCode()).subtract(getProfitSharing(DataDictionaryEnum.LEVEL_FIB.getCode()));
+                }else if(!DataDictionaryEnum.LEVEL_IB.getCode().equals(LEVEL_IB)){
+                    multiply = getProfitSharing(DataDictionaryEnum.LEVEL_AIB.getCode()).subtract(getProfitSharing(DataDictionaryEnum.LEVEL_IB.getCode()));
                 }else{
                     multiply = getProfitSharing(DataDictionaryEnum.LEVEL_AIB.getCode());
                 }
                 multiply = totalProfit.multiply(multiply);
                 DappMemberEntity dappMemberEntityLEVEL_AIB = dappMemberDao.selectMemberInfoByInviteId(LEVEL_AIB);
-                dappWalletCoinDao.addTotalAndaddAvailableById(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
+                        || 2 != dappMemberEntityLEVEL_AIB.getIsOnHook()){
+                    dappWalletCoinDao.addTotalAndaddAvailableByMemberId(dappMemberEntityLEVEL_AIB.getId(), multiply);
+                    DappAccountMoneyChangeEntity dappAccountMoneyChangeEntity = new DappAccountMoneyChangeEntity(
+                            dappMemberEntityLEVEL_AIB.getId(),dappWalletCoinEntity.getAvailableAmount(),
+                            multiply, dappWalletCoinEntity.getAvailableAmount().add(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)){
                 BigDecimal multiply = BigDecimal.ZERO;
                 if(!DataDictionaryEnum.LEVEL_AIB.getCode().equals(LEVEL_AIB)){
                     multiply = getProfitSharing(DataDictionaryEnum.LEVEL_GIB.getCode()).subtract(getProfitSharing(DataDictionaryEnum.LEVEL_AIB.getCode()));
+                }else if(!DataDictionaryEnum.LEVEL_CIB.getCode().equals(LEVEL_CIB)){
+                    multiply = getProfitSharing(DataDictionaryEnum.LEVEL_GIB.getCode()).subtract(getProfitSharing(DataDictionaryEnum.LEVEL_CIB.getCode()));
+                }else if(!DataDictionaryEnum.LEVEL_FIB.getCode().equals(LEVEL_FIB)){
+                    multiply = getProfitSharing(DataDictionaryEnum.LEVEL_GIB.getCode()).subtract(getProfitSharing(DataDictionaryEnum.LEVEL_FIB.getCode()));
+                }else if(!DataDictionaryEnum.LEVEL_IB.getCode().equals(LEVEL_IB)){
+                    multiply = getProfitSharing(DataDictionaryEnum.LEVEL_GIB.getCode()).subtract(getProfitSharing(DataDictionaryEnum.LEVEL_IB.getCode()));
                 }else{
                     multiply = getProfitSharing(DataDictionaryEnum.LEVEL_GIB.getCode());
                 }
                 multiply = totalProfit.multiply(multiply);
                 DappMemberEntity dappMemberEntityLEVEL_GIB = dappMemberDao.selectMemberInfoByInviteId(LEVEL_GIB);
-                dappWalletCoinDao.addTotalAndaddAvailableById(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
+                        || 2 != dappMemberEntityLEVEL_GIB.getIsOnHook()){
+                    dappWalletCoinDao.addTotalAndaddAvailableByMemberId(dappMemberEntityLEVEL_GIB.getId(), multiply);
+                    DappAccountMoneyChangeEntity dappAccountMoneyChangeEntity = new DappAccountMoneyChangeEntity(
+                            dappMemberEntityLEVEL_GIB.getId(),dappWalletCoinEntity.getAvailableAmount(),
+                            multiply, dappWalletCoinEntity.getAvailableAmount().add(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)){
                 BigDecimal multiply = BigDecimal.ZERO;
                 if(!DataDictionaryEnum.LEVEL_GIB.getCode().equals(LEVEL_GIB)){
                     multiply = getProfitSharing(DataDictionaryEnum.LEVEL_BP.getCode()).subtract(getProfitSharing(DataDictionaryEnum.LEVEL_GIB.getCode()));
+                }else if(!DataDictionaryEnum.LEVEL_AIB.getCode().equals(LEVEL_AIB)){
+                    multiply = getProfitSharing(DataDictionaryEnum.LEVEL_BP.getCode()).subtract(getProfitSharing(DataDictionaryEnum.LEVEL_AIB.getCode()));
+                }else if(!DataDictionaryEnum.LEVEL_CIB.getCode().equals(LEVEL_CIB)){
+                    multiply = getProfitSharing(DataDictionaryEnum.LEVEL_BP.getCode()).subtract(getProfitSharing(DataDictionaryEnum.LEVEL_CIB.getCode()));
+                }else if(!DataDictionaryEnum.LEVEL_FIB.getCode().equals(LEVEL_FIB)){
+                    multiply = getProfitSharing(DataDictionaryEnum.LEVEL_BP.getCode()).subtract(getProfitSharing(DataDictionaryEnum.LEVEL_FIB.getCode()));
+                }else if(!DataDictionaryEnum.LEVEL_IB.getCode().equals(LEVEL_IB)){
+                    multiply = getProfitSharing(DataDictionaryEnum.LEVEL_BP.getCode()).subtract(getProfitSharing(DataDictionaryEnum.LEVEL_IB.getCode()));
                 }else{
                     multiply = getProfitSharing(DataDictionaryEnum.LEVEL_BP.getCode());
                 }
                 multiply = totalProfit.multiply(multiply);
                 DappMemberEntity dappMemberEntityLEVEL_BP = dappMemberDao.selectMemberInfoByInviteId(LEVEL_BP);
-                dappWalletCoinDao.addTotalAndaddAvailableById(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
+                        || 2 != dappMemberEntityLEVEL_BP.getIsOnHook()){
+                    dappWalletCoinDao.addTotalAndaddAvailableByMemberId(dappMemberEntityLEVEL_BP.getId(), multiply);
+                    DappAccountMoneyChangeEntity dappAccountMoneyChangeEntity = new DappAccountMoneyChangeEntity(
+                            dappMemberEntityLEVEL_BP.getId(),dappWalletCoinEntity.getAvailableAmount(),
+                            multiply, dappWalletCoinEntity.getAvailableAmount().add(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)){
                 BigDecimal multiply = BigDecimal.ZERO;
                 if(!DataDictionaryEnum.LEVEL_BP.getCode().equals(LEVEL_BP)){
                     multiply = getProfitSharing(DataDictionaryEnum.LEVEL_SP.getCode()).subtract(getProfitSharing(DataDictionaryEnum.LEVEL_BP.getCode()));
+                }else if(!DataDictionaryEnum.LEVEL_GIB.getCode().equals(LEVEL_GIB)){
+                    multiply = getProfitSharing(DataDictionaryEnum.LEVEL_SP.getCode()).subtract(getProfitSharing(DataDictionaryEnum.LEVEL_GIB.getCode()));
+                }else if(!DataDictionaryEnum.LEVEL_AIB.getCode().equals(LEVEL_AIB)){
+                    multiply = getProfitSharing(DataDictionaryEnum.LEVEL_SP.getCode()).subtract(getProfitSharing(DataDictionaryEnum.LEVEL_AIB.getCode()));
+                }else if(!DataDictionaryEnum.LEVEL_CIB.getCode().equals(LEVEL_CIB)){
+                    multiply = getProfitSharing(DataDictionaryEnum.LEVEL_SP.getCode()).subtract(getProfitSharing(DataDictionaryEnum.LEVEL_CIB.getCode()));
+                }else if(!DataDictionaryEnum.LEVEL_FIB.getCode().equals(LEVEL_FIB)){
+                    multiply = getProfitSharing(DataDictionaryEnum.LEVEL_SP.getCode()).subtract(getProfitSharing(DataDictionaryEnum.LEVEL_FIB.getCode()));
+                }else if(!DataDictionaryEnum.LEVEL_IB.getCode().equals(LEVEL_IB)){
+                    multiply = getProfitSharing(DataDictionaryEnum.LEVEL_SP.getCode()).subtract(getProfitSharing(DataDictionaryEnum.LEVEL_IB.getCode()));
                 }else{
                     multiply = getProfitSharing(DataDictionaryEnum.LEVEL_SP.getCode());
                 }
                 multiply = totalProfit.multiply(multiply);
                 DappMemberEntity dappMemberEntityLEVEL_SP = dappMemberDao.selectMemberInfoByInviteId(LEVEL_SP);
-                dappWalletCoinDao.addTotalAndaddAvailableById(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
+                        || 2 != dappMemberEntityLEVEL_SP.getIsOnHook()){
+                    dappWalletCoinDao.addTotalAndaddAvailableByMemberId(dappMemberEntityLEVEL_SP.getId(), multiply);
+                    DappAccountMoneyChangeEntity dappAccountMoneyChangeEntity = new DappAccountMoneyChangeEntity(
+                            dappMemberEntityLEVEL_SP.getId(),dappWalletCoinEntity.getAvailableAmount(),
+                            multiply, dappWalletCoinEntity.getAvailableAmount().add(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)){
                 BigDecimal multiply = BigDecimal.ZERO;
                 if(!DataDictionaryEnum.LEVEL_SP.getCode().equals(LEVEL_SP)){
                     multiply = getProfitSharing(DataDictionaryEnum.LEVEL_GP.getCode()).subtract(getProfitSharing(DataDictionaryEnum.LEVEL_SP.getCode()));
+                }else if(!DataDictionaryEnum.LEVEL_BP.getCode().equals(LEVEL_BP)){
+                    multiply = getProfitSharing(DataDictionaryEnum.LEVEL_GP.getCode()).subtract(getProfitSharing(DataDictionaryEnum.LEVEL_BP.getCode()));
+                }else if(!DataDictionaryEnum.LEVEL_GIB.getCode().equals(LEVEL_GIB)){
+                    multiply = getProfitSharing(DataDictionaryEnum.LEVEL_GP.getCode()).subtract(getProfitSharing(DataDictionaryEnum.LEVEL_GIB.getCode()));
+                }else if(!DataDictionaryEnum.LEVEL_AIB.getCode().equals(LEVEL_AIB)){
+                    multiply = getProfitSharing(DataDictionaryEnum.LEVEL_GP.getCode()).subtract(getProfitSharing(DataDictionaryEnum.LEVEL_AIB.getCode()));
+                }else if(!DataDictionaryEnum.LEVEL_CIB.getCode().equals(LEVEL_CIB)){
+                    multiply = getProfitSharing(DataDictionaryEnum.LEVEL_GP.getCode()).subtract(getProfitSharing(DataDictionaryEnum.LEVEL_CIB.getCode()));
+                }else if(!DataDictionaryEnum.LEVEL_FIB.getCode().equals(LEVEL_FIB)){
+                    multiply = getProfitSharing(DataDictionaryEnum.LEVEL_GP.getCode()).subtract(getProfitSharing(DataDictionaryEnum.LEVEL_FIB.getCode()));
+                }else if(!DataDictionaryEnum.LEVEL_IB.getCode().equals(LEVEL_IB)){
+                    multiply = getProfitSharing(DataDictionaryEnum.LEVEL_GP.getCode()).subtract(getProfitSharing(DataDictionaryEnum.LEVEL_IB.getCode()));
                 }else{
-                    multiply = getProfitSharing(DataDictionaryEnum.LEVEL_SP.getCode());
+                    multiply = getProfitSharing(DataDictionaryEnum.LEVEL_GP.getCode());
                 }
                 multiply = totalProfit.multiply(multiply);
                 DappMemberEntity dappMemberEntityLEVEL_GP = dappMemberDao.selectMemberInfoByInviteId(LEVEL_GP);
-                dappWalletCoinDao.addTotalAndaddAvailableById(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
+                        || 2 != dappMemberEntityLEVEL_GP.getIsOnHook()){
+                    dappWalletCoinDao.addTotalAndaddAvailableByMemberId(dappMemberEntityLEVEL_GP.getId(), multiply);
+                    DappAccountMoneyChangeEntity dappAccountMoneyChangeEntity = new DappAccountMoneyChangeEntity(
+                            dappMemberEntityLEVEL_GP.getId(),dappWalletCoinEntity.getAvailableAmount(),
+                            multiply, dappWalletCoinEntity.getAvailableAmount().add(multiply), "盈利分成", 8, id);
+                    dappAccountMoneyChangeDao.insert(dappAccountMoneyChangeEntity);
+                    profitSharingTotal = profitSharingTotal.add(multiply);
+                }
             }
 
 
@@ -996,11 +1154,16 @@
                 BigDecimal multiply = totalProfit.multiply(getRunningCommission(DataDictionaryEnum.LEVEL_AIB.getCode()));
                 DappMemberEntity dappMemberEntityLEVEL_AIB = dappMemberDao.selectMemberInfoByInviteId(LEVEL_AIB);
 
-                dappWalletCoinDao.addTotalAndaddAvailableById(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
+                        || 2 != dappMemberEntityLEVEL_AIB.getIsOnHook()){
+                    dappWalletCoinDao.addTotalAndaddAvailableByMemberId(dappMemberEntityLEVEL_AIB.getId(), multiply);
+                    DappAccountMoneyChangeEntity dappAccountMoneyChangeEntity = new DappAccountMoneyChangeEntity(
+                            dappMemberEntityLEVEL_AIB.getId(),dappWalletCoinEntity.getAvailableAmount(),
+                            multiply, dappWalletCoinEntity.getAvailableAmount().add(multiply), "流水佣金", 7, id);
+                    dappAccountMoneyChangeDao.insert(dappAccountMoneyChangeEntity);
+                    profitSharingTotal = profitSharingTotal.add(multiply);
+                }
             }
 
             String LEVEL_GIB = isIdentity(refererIdList, DataDictionaryEnum.LEVEL_GIB.getCode());
@@ -1008,11 +1171,16 @@
                 BigDecimal multiply = totalProfit.multiply(getRunningCommission(DataDictionaryEnum.LEVEL_GIB.getCode()));
                 DappMemberEntity dappMemberEntityLEVEL_GIB = dappMemberDao.selectMemberInfoByInviteId(LEVEL_GIB);
 
-                dappWalletCoinDao.addTotalAndaddAvailableById(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
+                        || 2 != dappMemberEntityLEVEL_GIB.getIsOnHook()){
+                    dappWalletCoinDao.addTotalAndaddAvailableByMemberId(dappMemberEntityLEVEL_GIB.getId(), multiply);
+                    DappAccountMoneyChangeEntity dappAccountMoneyChangeEntity = new DappAccountMoneyChangeEntity(
+                            dappMemberEntityLEVEL_GIB.getId(),dappWalletCoinEntity.getAvailableAmount(),
+                            multiply, dappWalletCoinEntity.getAvailableAmount().add(multiply), "流水佣金", 7, id);
+                    dappAccountMoneyChangeDao.insert(dappAccountMoneyChangeEntity);
+                    profitSharingTotal = profitSharingTotal.add(multiply);
+                }
             }
 
             String LEVEL_BP = isIdentity(refererIdList, DataDictionaryEnum.LEVEL_BP.getCode());
@@ -1020,11 +1188,16 @@
                 BigDecimal multiply = totalProfit.multiply(getRunningCommission(DataDictionaryEnum.LEVEL_BP.getCode()));
                 DappMemberEntity dappMemberEntityLEVEL_BP = dappMemberDao.selectMemberInfoByInviteId(LEVEL_BP);
 
-                dappWalletCoinDao.addTotalAndaddAvailableById(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
+                        || 2 != dappMemberEntityLEVEL_BP.getIsOnHook()){
+                    dappWalletCoinDao.addTotalAndaddAvailableByMemberId(dappMemberEntityLEVEL_BP.getId(), multiply);
+                    DappAccountMoneyChangeEntity dappAccountMoneyChangeEntity = new DappAccountMoneyChangeEntity(
+                            dappMemberEntityLEVEL_BP.getId(),dappWalletCoinEntity.getAvailableAmount(),
+                            multiply, dappWalletCoinEntity.getAvailableAmount().add(multiply), "流水佣金", 7, id);
+                    dappAccountMoneyChangeDao.insert(dappAccountMoneyChangeEntity);
+                    profitSharingTotal = profitSharingTotal.add(multiply);
+                }
             }
 
             String LEVEL_SP = isIdentity(refererIdList, DataDictionaryEnum.LEVEL_SP.getCode());
@@ -1032,11 +1205,16 @@
                 BigDecimal multiply = totalProfit.multiply(getRunningCommission(DataDictionaryEnum.LEVEL_SP.getCode()));
                 DappMemberEntity dappMemberEntityLEVEL_SP = dappMemberDao.selectMemberInfoByInviteId(LEVEL_SP);
 
-                dappWalletCoinDao.addTotalAndaddAvailableById(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
+                        || 2 != dappMemberEntityLEVEL_SP.getIsOnHook()){
+                    dappWalletCoinDao.addTotalAndaddAvailableByMemberId(dappMemberEntityLEVEL_SP.getId(), multiply);
+                    DappAccountMoneyChangeEntity dappAccountMoneyChangeEntity = new DappAccountMoneyChangeEntity(
+                            dappMemberEntityLEVEL_SP.getId(),dappWalletCoinEntity.getAvailableAmount(),
+                            multiply, dappWalletCoinEntity.getAvailableAmount().add(multiply), "流水佣金", 7, id);
+                    dappAccountMoneyChangeDao.insert(dappAccountMoneyChangeEntity);
+                    profitSharingTotal = profitSharingTotal.add(multiply);
+                }
             }
 
             String LEVEL_GP = isIdentity(refererIdList, DataDictionaryEnum.LEVEL_GP.getCode());
@@ -1044,23 +1222,79 @@
                 BigDecimal multiply = totalProfit.multiply(getRunningCommission(DataDictionaryEnum.LEVEL_GP.getCode()));
                 DappMemberEntity dappMemberEntityLEVEL_GP = dappMemberDao.selectMemberInfoByInviteId(LEVEL_GP);
 
-                dappWalletCoinDao.addTotalAndaddAvailableById(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
+                        || 2 != dappMemberEntityLEVEL_GP.getIsOnHook()){
+                    dappWalletCoinDao.addTotalAndaddAvailableByMemberId(dappMemberEntityLEVEL_GP.getId(), multiply);
+                    DappAccountMoneyChangeEntity dappAccountMoneyChangeEntity = new DappAccountMoneyChangeEntity(
+                            dappMemberEntityLEVEL_GP.getId(),dappWalletCoinEntity.getAvailableAmount(),
+                            multiply, dappWalletCoinEntity.getAvailableAmount().add(multiply), "流水佣金", 7, id);
+                    dappAccountMoneyChangeDao.insert(dappAccountMoneyChangeEntity);
+                    profitSharingTotal = profitSharingTotal.add(multiply);
+                }
             }
         }
         return profitSharingTotal;
     }
 
     @Override
-    public BigDecimal updatePTFC(Long memberId, BigDecimal totalProfit) {
-        BigDecimal multiply = totalProfit.multiply(new BigDecimal(0.05));
-        DappAccountMoneyChangeEntity dappAccountMoneyChangeEntity = new DappAccountMoneyChangeEntity(
-                memberId, multiply, "系统", 9);
+    public BigDecimal updatePTFC(Long memberId, BigDecimal totalProfit,long id) {
+        if(BigDecimal.ZERO.compareTo(totalProfit)>=0){
+            return BigDecimal.ZERO;
+        }
+        DappAccountMoneyChangeEntity dappAccountMoneyChangeEntity = new DappAccountMoneyChangeEntity(65L,
+                totalProfit, "系统", 9,id);
         dappAccountMoneyChangeDao.insert(dappAccountMoneyChangeEntity);
-        return multiply;
+        return totalProfit;
+    }
+
+    @Override
+    public Integer isGoal(String num) {
+        Set set = new HashSet();
+        num = StrUtil.subSuf(num,1);
+        char[] chars = num.toCharArray();
+        for(char c:chars) {
+            set.add(c);
+        }
+        if(set.size()==num.length()){
+            return 1;
+        }else{
+            return 2;
+        }
+    }
+
+    private final MemberCoinChargeDao memberCoinChargeDao;
+
+    @Override
+    public IPage<AdminMoneyTotalVo> moneyTotal(DappAccountMoneyChangeEntity record, QueryRequest request) {
+        Page<DappAccountMoneyChangeEntity> page = new Page<>(request.getPageNum(), request.getPageSize());
+        //获取充值提现的所有日期
+        IPage<AdminMoneyTotalVo> adminMoneyTotalVoIPage = dappAccountMoneyChangeDao.selectMoneyTotalInPage(record, page);
+        List<AdminMoneyTotalVo> records = adminMoneyTotalVoIPage.getRecords();
+        if(CollUtil.isNotEmpty(records)){
+            for(AdminMoneyTotalVo adminMoneyTotalVo : records){
+                Date createTime = adminMoneyTotalVo.getCreateTime();
+                //每日充值统计
+                AdminMemberChargeVo adminMemberChargeVos = memberCoinChargeDao.selectTotalAmountByCreateTimeAndInviteId(createTime,record.getDescription());
+                adminMoneyTotalVo.setTotalCharge(adminMemberChargeVos.getTotalCharge().setScale(2,BigDecimal.ROUND_DOWN));
+                adminMoneyTotalVo.setSheetIn(adminMemberChargeVos.getSheetIn());
+                //每日提现统计
+                AdminMemberWithdrawVo adminMemberWithdrawVo = memberCoinWithdrawDao.selectTotalAmountByCreateTimeAndInviteId(createTime,record.getDescription());
+                adminMoneyTotalVo.setTotalWithdraw(adminMemberWithdrawVo.getTotalWithdraw().setScale(2,BigDecimal.ROUND_DOWN));
+                adminMoneyTotalVo.setSheetOut(adminMemberWithdrawVo.getSheetOut());
+            }
+        }
+        return adminMoneyTotalVoIPage;
+    }
+
+    public static void main(String[] args) {
+
+        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){
@@ -1071,6 +1305,7 @@
                 String identity = dappMemberEntity.getIdentity();
                 if(levelCode.equals(identity)){
                     flag = str;
+                    return flag;
                 }
             }
         }

--
Gitblit v1.9.1