diff --git a/Application/Admin/Controller/CompanyStatementLackController.class.php b/Application/Admin/Controller/CompanyStatementLackController.class.php index dacf289f1..d28c960f0 100644 --- a/Application/Admin/Controller/CompanyStatementLackController.class.php +++ b/Application/Admin/Controller/CompanyStatementLackController.class.php @@ -114,7 +114,7 @@ class CompanyStatementLackController extends ThinkController //获取基本信息 $dbres = $this->DBModel->where("id='{$id}'")->select(); - $withdraw_type = $dbres[0]['withdraw_type']; + $withdraw_type = -9; $title = $dbres[0]['company_name']; $this->assign("title",$title); diff --git a/Application/Admin/Controller/CompanyStatementPoolController.class.php b/Application/Admin/Controller/CompanyStatementPoolController.class.php index c0a72e2de..9c2ccf632 100644 --- a/Application/Admin/Controller/CompanyStatementPoolController.class.php +++ b/Application/Admin/Controller/CompanyStatementPoolController.class.php @@ -216,14 +216,14 @@ class CompanyStatementPoolController extends ThinkController $this->viewCpPool($infolist,$is_export); }elseif($infolist[0]['company_type'] == 1){ //下游公司 - $this->viewPcPool($infolist,$is_export,$pool_info['withdraw_type']); + $this->viewPcPool($infolist,$is_export); }else{ - $this->viewPuPool($infolist,$is_export,$pool_info['withdraw_type']); + $this->viewPuPool($infolist,$is_export); } } //个人汇总结算查看 - public function viewPuPool(&$infolist,$is_export,$withdraw = 0){ + public function viewPuPool(&$infolist,$is_export){ $line = 1; $count = []; //获取对接人 @@ -251,7 +251,7 @@ class CompanyStatementPoolController extends ThinkController foreach($va['game_list'] as $key=>&$val){ $line ++; - if($withdraw != 3) { + if($v['withdraw_type'] != 3) { if(isset($val['ratio'])){ $val['increment_ratio'] = 0; }else{ @@ -260,7 +260,7 @@ class CompanyStatementPoolController extends ThinkController } if($is_export){ - if($withdraw != 3) { + if($v['withdraw_type'] != 3) { $val['sum_money'] = "=J{$line}*(K{$line}+L{$line})"; } else { $val['sum_money'] = "=J{$line}*(L{$line})"; @@ -300,7 +300,7 @@ class CompanyStatementPoolController extends ThinkController $this->display("CompanyStatementPool/viewPuPool"); } //下游汇总结算查看 - public function viewPcPool(&$infolist,$is_export,$withdraw = 0){ + public function viewPcPool(&$infolist,$is_export){ $line = 1; $count = []; //获取对接人 @@ -329,7 +329,8 @@ class CompanyStatementPoolController extends ThinkController $cline = $line+1; foreach($v['statement_info'] as $ke=>&$va){ $line ++; - if($withdraw != 3) { + + if($v['withdraw_type'] != 3) { if (isset($va['ratio'])) { $va['increment_ratio'] = 0; } else { @@ -338,7 +339,7 @@ class CompanyStatementPoolController extends ThinkController } if($is_export){ - if($withdraw != 3) { + if($v['withdraw_type'] != 3) { $va['d_statement_money'] = "=D{$line}*(1-G{$line})*(E{$line}+F{$line})"; } else { $va['d_statement_money'] = "=D{$line}*(F{$line})"; @@ -354,7 +355,7 @@ class CompanyStatementPoolController extends ThinkController $v['settlement_contact'] = $Partner[$v['company_id']]; if($is_export){ - if ($withdraw != 3) { + if ($v['withdraw_type'] != 3) { $v['statement_money'] = "=SUM(H{$cline}:H{$line})+J{$cline}-I{$cline}"; }