|
|
|
@ -48,7 +48,7 @@ class CompanyGameRatioModel extends Model
|
|
|
|
|
if ($value['begin_time'] > $company_begin_time) {
|
|
|
|
|
$game_ratio[$game_id] = array_merge($game_ratio[$game_id],$this->getGameRadio($company_id,$game_id,$company_belong,$company_begin_time,$value['begin_time']));
|
|
|
|
|
|
|
|
|
|
if ($value['end_time'] >= $company_end_time) {
|
|
|
|
|
if ($value['end_time'] >= $company_end_time || !$value['end_time']) {
|
|
|
|
|
// $game_ratio[$game_id] = array_merge($game_ratio[$game_id],[[
|
|
|
|
|
// "begintime" => $value['begin_time'],
|
|
|
|
|
// "endtime"=>$company_end_time,
|
|
|
|
@ -75,7 +75,7 @@ class CompanyGameRatioModel extends Model
|
|
|
|
|
}
|
|
|
|
|
}
|
|
|
|
|
} else {
|
|
|
|
|
if ($value['end_time'] >= $company_end_time) {
|
|
|
|
|
if ($value['end_time'] >= $company_end_time || !$value['end_time']) {
|
|
|
|
|
// $game_ratio[$game_id] = array_merge($game_ratio[$game_id],[[
|
|
|
|
|
// "begintime" => $company_begin_time,
|
|
|
|
|
// "endtime"=>$company_end_time,
|
|
|
|
|