diff --git a/Application/Admin/Controller/CompanyStatementSetController.class.php b/Application/Admin/Controller/CompanyStatementSetController.class.php index 1e2ba55b2..bfad9f77e 100644 --- a/Application/Admin/Controller/CompanyStatementSetController.class.php +++ b/Application/Admin/Controller/CompanyStatementSetController.class.php @@ -930,6 +930,7 @@ class CompanyStatementSetController extends Controller { if(empty($list)){continue;} foreach($list as $k=>$v){ + try { $res[$company_id]["pay_amount"] += $v['pay_amount']; } catch (\Throwable $th) { @@ -937,11 +938,14 @@ class CompanyStatementSetController extends Controller { } if(isset($res[$company_id][$v['relation_game_id']])){ // + $res[$company_id][$v['relation_game_id']]['pay_amount'] += $v['pay_amount']; $res[$company_id][$v['relation_game_id']]['ratio_pay_amount'] += $v['pay_amount']; }else{ + unset($v['game_id']); + $v['ratio_pay_amount'] = $v['pay_amount']; $res[$company_id][$v['relation_game_id']]= $v; } } @@ -950,6 +954,7 @@ class CompanyStatementSetController extends Controller { $game_ids = $this->getModuleRatioGame($company_id,$game_ids,$begintime,$endtime); $sameGame = $this->getTheSameGame($game_ids); + if(!empty($sameGame)){ foreach ($sameGame as $k => $v) { @@ -983,6 +988,7 @@ class CompanyStatementSetController extends Controller { } + foreach($res as $key=>$value){ foreach ($value as $k => $v){ diff --git a/Application/Admin/View/CompanyGameRatio/addRatio.html b/Application/Admin/View/CompanyGameRatio/addRatio.html index d0003d30e..21babde3f 100644 --- a/Application/Admin/View/CompanyGameRatio/addRatio.html +++ b/Application/Admin/View/CompanyGameRatio/addRatio.html @@ -316,7 +316,7 @@ $(function(){ //判断日期是否小于当周周一 if (momday > cres.begin_time) { - layer.msg("配置的开始日期不能大于当周周一", {icon: 2}); + layer.msg("配置的开始日期不能小于当周周一", {icon: 2}); return false; }