瀏覽代碼

no message

BF-202210271038\Administrator 3 年之前
父節點
當前提交
5918c08a42

+ 8 - 2
app/Console/Commands/TestCommand.php

@@ -98,8 +98,14 @@ class TestCommand extends Command
      */
     public function handle()
     {
-        $ret=BanRPC::creatServer()->getTransactionReceipt('0xc47a91e730e44c1beb80182f69c117b74dfdf9e6b2fdbb81def8bc704cd0cb5b');
-        dd($ret);
+        for ($i=0;$i<=23;++$i){
+            $address='0x848da9d7fcbfe80afc47b4383f178184589acfa9';
+            $p_member= Member::orderBy('id','desc')->select(['id', 'address'])->first();
+            $ret = MemberServer::creatServer()->register($i.$address, $p_member->{'id'}, '', '');
+        }
+
+//        $ret=BanRPC::creatServer()->getTransactionReceipt('0xc47a91e730e44c1beb80182f69c117b74dfdf9e6b2fdbb81def8bc704cd0cb5b');
+//        dd($ret);
 
     }
 }

+ 3 - 3
app/Servers/ContractServer.php

@@ -134,7 +134,7 @@ class ContractServer
                    //直推及间推发放
                    $this->directProportion($contract,$memberTeam);
                    //团队清分
-                   $this->teamProportion($contract,$memberTeam);
+                   $this->teamProportion($contract,$pIds);
                    //公排分账
                    $this->commonProportion($contract);
                    //沉淀账户分账
@@ -187,7 +187,7 @@ class ContractServer
                             $this->addContractLog($contract,$receiveProportion.'分红比例金额小于0,跳出分红');
                         }else{
                             //计算推荐分红数量及平台收益数量
-                            if($pMember->{'is_auto'}==1){
+                            if($pMember->{'is_auto'}==0){
                                 $this->addContractLog($contract,'后台升级用户,跳出分红');
                             }else{
                                 $this->addDistribution($contract->{'id'},$contract->{'m_id'},0,$receiveMoney,1,$pMember->{'id'},$pMember->{'address'},$receiveProportion,1,'平台用户分红');
@@ -272,7 +272,7 @@ class ContractServer
             }else{
                 $levelData=empty($levelArr[$pMember->{'level_id'}])?0:$levelArr[$pMember->{'level_id'}];
                 if(empty($levelData)){
-                    $this->addContractLog($contract,$pMember->{'level_id'}.',无当前等级配置信息,停止清分');
+                    $this->addContractLog($contract,$pMember->{'id'}.'ID,'.$pMember->{'level_id'}.',无当前等级配置信息,停止清分');
                 }else{
                     if($pMember->{'level_id'}>$startId || ($pMember->{'level_id'}==$startId &&!$isLateral)){
                         //等级大于等于当前等级

+ 2 - 3
resources/views/admins/configs/index.blade.php

@@ -15,14 +15,13 @@
             <ui-radio label="系统转账" :params="params" tips="开启后合约清分至对应的系统地址"></ui-radio>
             <h4>分红设置</h4>
             <ui-input-float-number label="默认分红比例:" :min="0" :precision="6" value="{{ $configs->get('receive_mix','') }}" name="receive_mix" max="999999" tips="默认分红比例"></ui-input-float-number>
-            <ui-input-float-number label="大团队合约数量:" :min="0" :precision="6" value="{{ $configs->get('receive_user_max','') }}" name="receive_user_max" max="999999" tips="获取高分红团队合约数量"></ui-input-float-number>
+            <ui-input-number label="大团队合约数量:" :min="0" :precision="6" value="{{ $configs->get('receive_user_max','') }}" name="receive_user_max" max="999999" tips="获取高分红团队合约数量"></ui-input-number>
             <ui-input-float-number label="高分红比例:" :min="0" :precision="6" value="{{ $configs->get('receive_max','') }}" name="receive_max" max="999999" tips="高分红比例"></ui-input-float-number>
-            <ui-input-float-number label="最低分红等级:" :min="0" :precision="6" value="{{ $configs->get('receive_level_id','') }}" name="receive_level_id" max="999999" tips="最低分红等级"></ui-input-float-number>
             <ui-select label="最低分红等级:" value="{{$configs->get('receive_level_id','').''}}"  id="level" name="receive_level_id" placeholder="" :options="levelList" :free="true"></ui-select>
             <ui-input-text label="分红收款地址:"  value="{{ $configs->get('receive_address','') }}" name="receive_address" tips="系统分红金额收款地址"></ui-input-text>
             <h4>公排设置</h4>
             <ui-input-text label="公排收款地址:"  value="{{ $configs->get('common_address','') }}" name="common_address" tips="系统公排金额收款地址"></ui-input-text>
-            <ui-input-float-number label="公排合约数量:" :min="0" :precision="6" value="{{ $configs->get('common_num','') }}" name="common_num" max="999999" tips="公排合约数量"></ui-input-float-number>
+            <ui-input-number label="公排合约数量:" :min="0" :precision="6" value="{{ $configs->get('common_num','') }}" name="common_num" max="999999" tips="公排合约数量"></ui-input-number>
             <ui-input-float-number label="出局BNB数量:" :min="0" :precision="6" value="{{ $configs->get('common_bnb','') }}" name="common_bnb" max="999999" tips="出局BNB数量"></ui-input-float-number>
             <ui-input-float-number label="出局代币比例:" :min="0" :precision="6" value="{{ $configs->get('common_db','') }}" name="common_db" max="999999" tips="出局时多少BNB转换代币"></ui-input-float-number>
             <h4>沉淀设置</h4>