diff --git a/Application/Admin/Controller/CompanyGameRatioController.class.php b/Application/Admin/Controller/CompanyGameRatioController.class.php index 0a3969f79..2a5697d84 100644 --- a/Application/Admin/Controller/CompanyGameRatioController.class.php +++ b/Application/Admin/Controller/CompanyGameRatioController.class.php @@ -137,6 +137,10 @@ class CompanyGameRatioController extends AdminController $v["turnover_types"][$tk] = "月流水"; } elseif($turnover_type[$tk] == 2) { $v["turnover_types"][$tk] = "历史流水"; + } elseif($turnover_type[$tk] == 3) { + $v["turnover_types"][$tk] = "cp月流水"; + } elseif($turnover_type[$tk] == 4) { + $v["turnover_types"][$tk] = "cp历史流水"; } } @@ -281,6 +285,10 @@ class CompanyGameRatioController extends AdminController $v["turnover_types"] = "月流水"; } elseif($v["turnover_type"] == 2) { $v["turnover_types"] = "历史流水"; + } elseif($v["turnover_type"] == 3) { + $v["turnover_types"] = "cp月流水"; + } elseif($v["turnover_type"] == 4) { + $v["turnover_types"] = "cp历史流水"; } diff --git a/Application/Admin/Controller/CompanyStatementSetController.class.php b/Application/Admin/Controller/CompanyStatementSetController.class.php index 901c84282..8e04b19b8 100644 --- a/Application/Admin/Controller/CompanyStatementSetController.class.php +++ b/Application/Admin/Controller/CompanyStatementSetController.class.php @@ -765,7 +765,9 @@ class CompanyStatementSetController extends Controller { $game['sum_money']=round($game['pay_amount']*$tratio*(100-$fax_ratio)/(100*100),2);//结算金额=平台总额*(分成比例+补点比例)*(1-税费费率) $add_data['statement_money'] += $game['sum_money']; - $add_data['statement_info'][] = $game; + if ($game['pay_amount'] != '0') { + $add_data['statement_info'][] = $game; + } }else{ // dd($t_game_ratio); for ($i=0; $i < count($t_game_ratio); $i++) { @@ -808,7 +810,9 @@ class CompanyStatementSetController extends Controller { } $temp_game['sum_money']=round($temp_game['pay_amount']*$tratio*(100-$fax_ratio)/(100*100),2);//结算金额=平台总额*(分成比例+补点比例)*(1-税费费率) $add_data['statement_money'] += $temp_game['sum_money']; - $add_data['statement_info'][] = $temp_game; + if ($temp_game['pay_amount'] != '0') { + $add_data['statement_info'][] = $temp_game; + } } } } @@ -874,7 +878,7 @@ class CompanyStatementSetController extends Controller { $is_continue = false; $statement_data = $add_data['statement_info']; foreach ($statement_data as $skey => $sval) { - if ($sval['game_list']) { + if ($sval) { $is_continue = true; } } @@ -1054,8 +1058,9 @@ class CompanyStatementSetController extends Controller { * 返回结算流水类型 */ public function getTurnoverType($relation_game_id = 0, $company_id = 0, $begin_time = 0, $end_time = 0){ - + $company_belong = M("promote_company","tab_")->field("company_belong")->where(['id'=>$company_id])->find(); $turnover_where = [ + "company_belong"=>$company_belong['company_belong'], "relation_game_id"=>$relation_game_id, "company_id"=>$company_id, "_string"=>"begin_time <={$end_time} AND ( end_time = 0 OR end_time >= {$begin_time})" @@ -1064,7 +1069,6 @@ class CompanyStatementSetController extends Controller { //判断特殊比例是否存在,存在直接返回结算流水类型 if (!$turnover_type) { - $company_belong = M("promote_company","tab_")->field("company_belong")->where(['id'=>$company_id])->find(); //判断公司内外团类型是否存在,不存在直接返回0 if (!$company_belong) { return 0; diff --git a/Application/Admin/Controller/GameRatioMouldController.class.php b/Application/Admin/Controller/GameRatioMouldController.class.php index af2df5c42..988d6bc21 100644 --- a/Application/Admin/Controller/GameRatioMouldController.class.php +++ b/Application/Admin/Controller/GameRatioMouldController.class.php @@ -66,6 +66,10 @@ class GameRatioMouldController extends AdminController $v["turnover_types"][$tk] = "月流水"; } elseif($turnover_type[$tk] == 2) { $v["turnover_types"][$tk] = "历史流水"; + } elseif($turnover_type[$tk] == 3) { + $v["turnover_types"][$tk] = "cp月流水"; + } elseif($turnover_type[$tk] == 4) { + $v["turnover_types"][$tk] = "cp历史流水"; } diff --git a/Application/Admin/View/CompanyGameRatio/addRatio.html b/Application/Admin/View/CompanyGameRatio/addRatio.html index e49ec2b50..fe34d9e71 100644 --- a/Application/Admin/View/CompanyGameRatio/addRatio.html +++ b/Application/Admin/View/CompanyGameRatio/addRatio.html @@ -154,6 +154,8 @@ diff --git a/Application/Admin/View/CompanyGameRatio/edit.html b/Application/Admin/View/CompanyGameRatio/edit.html index 4abe2e520..813e414eb 100644 --- a/Application/Admin/View/CompanyGameRatio/edit.html +++ b/Application/Admin/View/CompanyGameRatio/edit.html @@ -138,6 +138,8 @@ diff --git a/Application/Admin/View/CompanyGameRatio/editRatio.html b/Application/Admin/View/CompanyGameRatio/editRatio.html index f42a283cb..8c46ac2b3 100644 --- a/Application/Admin/View/CompanyGameRatio/editRatio.html +++ b/Application/Admin/View/CompanyGameRatio/editRatio.html @@ -134,6 +134,8 @@ diff --git a/Application/Admin/View/GameRatioMould/add.html b/Application/Admin/View/GameRatioMould/add.html index 37f9a2a7d..eb64212e4 100644 --- a/Application/Admin/View/GameRatioMould/add.html +++ b/Application/Admin/View/GameRatioMould/add.html @@ -150,6 +150,8 @@ diff --git a/Application/Admin/View/GameRatioMould/edit.html b/Application/Admin/View/GameRatioMould/edit.html index c16e5d0bb..4937eb11d 100644 --- a/Application/Admin/View/GameRatioMould/edit.html +++ b/Application/Admin/View/GameRatioMould/edit.html @@ -134,6 +134,8 @@