diff --git a/Application/Admin/Controller/CompanyStatementSetController.class.php b/Application/Admin/Controller/CompanyStatementSetController.class.php index db37408fd..2a67d37c8 100644 --- a/Application/Admin/Controller/CompanyStatementSetController.class.php +++ b/Application/Admin/Controller/CompanyStatementSetController.class.php @@ -1113,10 +1113,22 @@ class CompanyStatementSetController extends Controller { $v['fine'] += $val['fine']; $v['reward'] += $val['reward']; $v['platform_amount'] += $val['platform_amount']; - $v['statement_info'] = array_merge($v['statement_info'],json_decode($val['statement_info'],true)); - - $last_names = array_column($v['statement_info'],'game_name'); - array_multisort($last_names,SORT_DESC,SORT_STRING,$v['statement_info']); + $t_statement_info = json_decode($val['statement_info'],true); + $statement_info = []; + foreach($t_statement_info as $p=>$info){ + $statement_info[$info['account']] = $info['game_list']; + } + foreach($v['statement_info'] as $p=>&$info){ + if(isset($statement_info[$info['account']])){ + $info['game_list'] = array_merge($statement_info[$info['account']],$info['game_list']); + unset($statement_info[$info['account']]); + } + } + if(!empty($statement_info)){ + foreach($statement_info as $p=>$info){ + $v['statement_info'][] = ["account"=>$p,"game_list"=>$info]; + } + } } }