Merge branch 'feature/platfrom_aggregate_finance' of wmtx/platform into release

隐藏推广公司比例

Application/Admin/Controller/FinancePromoteController.class.php

@@ -141,10 +141,10 @@ class FinancePromoteController extends AdminController
             if(!array_key_exists('balance_coin_count',$v)) $v['balance_coin_count']=0;
             if(!array_key_exists('bind_coin_count',$v)) $v['bind_coin_count']=0;
             if(!array_key_exists('inside_cash_count',$v)) $v['inside_cash_count']=0;
-            $v['promote_account'] = $v['p_id'] == 0 ? '官方渠道' : ($promote ? $promote['account'] : '');
+            $v['promote_account'] = get_promote_name($v['p_id']);
+            ($v['promote_account']=='官方渠道')?($v['promote_account']=C('OFFICIEL_CHANNEL')):'';
             $v['admin_username'] = $adminUsernames[$promote['admin_id']] ?? '无';
             $v['develop_type_text'] = getCompanyDevelopTypeText($v['develop_type']);
-            
             $v['inside_cash_count'] = number_format($v['inside_cash_count'],2,'.','');
             $v['allcount'] = number_format($v['cash_count']-0+$v['balance_coin_count']+$v['bind_coin_count'],2,'.','');
             $count['cash_count'] +=  $v['cash_count'];

Application/Admin/Controller/PromoteCompanyController.class.php

@@ -59,6 +59,7 @@ class PromoteCompanyController extends ThinkController
         }else{
             $companyres = $companyres->page($page,$row)->select();
         }
+        if(1 == 0){
             //获取公司id
             $companyids = implode(',', array_column($companyres, 'id'));
             //获取所属会长及其游戏分成
@@ -139,39 +140,41 @@ class PromoteCompanyController extends ThinkController
                 $promoterestemp[$v['company_id']]["list"][]=$v;
             }
             unset($promoteres);
-        //处理公司数据
-        foreach($companyres as $k=>&$v){
-            if(array_key_exists($v['id'],$promoterestemp)){
-                //存在
-                $v['list'] = $promoterestemp[$v['id']]['list'];
-                foreach($promoterestemp[$v['id']] as $ke=>$va){
-                    foreach($va as $key=>$val){
-                        $v['row'] += $val['row'];
-                    }
            
         }
-                $v['can_del'] = 0;
-            }else{
-                //空值
-                $v['can_del'] = 1;
-                $v['list']=[
-                    [
-                        "account"=>"--",
-                        "settlement_type"=>"--",
-                        'list'=>[
-                            [
-                                "relation_game_name"=>"--",
-                                "game_type_name"=>"--",
-                                "turnover_ratio"=>[
-                                    ["name"=>"--","ratio"=>"--"]
-                                ],
-                                "row"=>1
-                            ]
-                        ]
-                    ]
-                ];
-                $v['row'] += 1;
-            }
+         //处理公司数据
+        foreach($companyres as $k=>&$v){
+            // if(array_key_exists($v['id'],$promoterestemp)){
+            //     //存在
+            //     $v['list'] = $promoterestemp[$v['id']]['list'];
+            //     foreach($promoterestemp[$v['id']] as $ke=>$va){
+            //         foreach($va as $key=>$val){
+            //             $v['row'] += $val['row'];
+            //         }
+                    
+            //     }
+            //     $v['can_del'] = 0;
+            // }else{
+            //     //空值
+            //     $v['can_del'] = 1;
+            //     $v['list']=[
+            //         [
+            //             "account"=>"--",
+            //             "settlement_type"=>"--",
+            //             'list'=>[
+            //                 [
+            //                     "relation_game_name"=>"--",
+            //                     "game_type_name"=>"--",
+            //                     "turnover_ratio"=>[
+            //                         ["name"=>"--","ratio"=>"--"]
+            //                     ],
+            //                     "row"=>1
+            //                 ]
+            //             ]
+            //         ]
+            //     ];
+            //     $v['row'] += 1;
+            // }
             if( $v["contact_begin"] >0 ){
                 $v["contact_begin"] = date('Y/m/d', $v["contact_begin"]);
             }else{
@@ -190,6 +193,7 @@ class PromoteCompanyController extends ThinkController
             $v["company_type"] = ($v["company_type"]=="1" ? "公司" :'个人');
             $v["company_belong"] = ($v["company_belong"]=="0" ? "内团" : ($v["company_belong"]=="1" ? "外团" : ($v["company_belong"]=="2" ? "外团分发" : '无')));
         }
+        
         // dd($companyres);
         
      

Application/Admin/Model/PromoteModel.class.php

@@ -464,7 +464,7 @@ class PromoteModel extends Model{
         $userAuth = session('user_auth');
         setPowerPromoteIds($where,'id');
 
-        $offcialData = [0=>['id'=>0,'nickname'=>'官方渠道']];
+        $offcialData = [0=>['id'=>0,'nickname'=>'江息网络']];
 
         $result = $this->field("*")->where($where)->select();
         foreach ($result as &$item) {

Application/Admin/View/PromoteCompany/lists.html

@@ -125,12 +125,12 @@
                     <th>银行账号</th>
                     <th>是否签署合同</th>
                     <th>备注</th>
-
+<!-- 
                     <th>会长账号</th>
                     <th>结算周期</th>
                     <th>产品类型</th>
                     <th>游戏名称</th>
-                    <th colspan="2">合作方分成比例</th>
+                    <th colspan="2">合作方分成比例</th> -->
                 </tr>
                 </thead>