|
|
|
@ -1196,6 +1196,7 @@ class CompanyStatementSetController extends Controller {
|
|
|
|
|
}
|
|
|
|
|
//聚合未结算数据
|
|
|
|
|
$lsres = $LackStatement->where("company_id='{$k}' and is_pool = 0")->select();
|
|
|
|
|
// dd($lsres);
|
|
|
|
|
|
|
|
|
|
$del_lack_ids = [];
|
|
|
|
|
if(count($lsres) > 0){
|
|
|
|
@ -1213,9 +1214,9 @@ class CompanyStatementSetController extends Controller {
|
|
|
|
|
foreach($t_statement_info as $p=>$info){
|
|
|
|
|
$statement_info[$info['account']] = $info['game_list'];
|
|
|
|
|
}
|
|
|
|
|
foreach($v['statement_info'] as $p=>&$info){
|
|
|
|
|
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']);
|
|
|
|
|
$v['statement_info'][$p]['game_list'] = array_merge($statement_info[$info['account']],$v['statement_info'][$p]['game_list']);
|
|
|
|
|
unset($statement_info[$info['account']]);
|
|
|
|
|
}
|
|
|
|
|
}
|
|
|
|
@ -1226,7 +1227,6 @@ class CompanyStatementSetController extends Controller {
|
|
|
|
|
}
|
|
|
|
|
}
|
|
|
|
|
}
|
|
|
|
|
|
|
|
|
|
if($type == 2 && $v['statement_money'] == 0){
|
|
|
|
|
//补点不存
|
|
|
|
|
}else{
|
|
|
|
|