diff --git a/Application/Admin/Controller/CompanySystemRatioController.class.php b/Application/Admin/Controller/CompanySystemRatioController.class.php index 8e4b947bf..f1c273a0c 100644 --- a/Application/Admin/Controller/CompanySystemRatioController.class.php +++ b/Application/Admin/Controller/CompanySystemRatioController.class.php @@ -44,6 +44,8 @@ class CompanySystemRatioController extends AdminController $handleData = $this->getCpGameRatio($handleData); $data = $this->handleRatio($handleData); + $checkData = $handleData; + // dump($data);die(); $gameData = M("game","tab_")->field("original_package_name,relation_game_name game_name,game_type_name,relation_game_id game_id") @@ -131,8 +133,43 @@ class CompanySystemRatioController extends AdminController ('<'). ($end); } else { - $data[$key]['data'][$k]['game_data'][$vk]['ratio_data'][$vvk]['turnover']= - '月流水='.$vvv['turnover']; + + if ($vvv['instanceof'] != 1) { + foreach ($this->checkRatio as $ck => $cv) { +// if($v['game_id'] == 187) { +// +// dump($checkData[$v['game_id']][$cv]); +// dump($vvv); +// } + foreach ($checkData[$v['game_id']][$cv] as $gk=> $gv){ +// if($cv == 2){ +// dump($gv); +// dump($vvv['turnover']); +// die(); + if($gv['turnover'] < $vvv['turnover']) { + $checkInstanceof = array_column($checkData[$v['game_id']][$cv],'instanceof'); +// if($v['game_id'] == 187 && $cv == 2) { +// dump($checkData[$v['game_id']][$cv]); +// dump($vvv['turnover']); +// dump(in_array(3,$checkInstanceof)); +// } +// in_array($checkInstanceof,2); + +// die(); + if (in_array(2,$checkInstanceof)) { + $data[$key]['data'][$k]['game_data'][$vk]['ratio_data'][$vvk][$cv] = $gv['ratio']; + } + } else { + break; + } +// } + + } + } + } + + $data[$key]['data'][$k]['game_data'][$vk]['ratio_data'][$vvk]['turnover']= + '月流水='.$vvv['turnover']; } } @@ -142,6 +179,7 @@ class CompanySystemRatioController extends AdminController } } } +// die(); if ($_REQUEST['export']) { $this->assign("is_export",true);