diff --git a/Application/Admin/Controller/CompanyStatementController.class.php b/Application/Admin/Controller/CompanyStatementController.class.php index a1d961da1..e4fe83fea 100644 --- a/Application/Admin/Controller/CompanyStatementController.class.php +++ b/Application/Admin/Controller/CompanyStatementController.class.php @@ -374,13 +374,16 @@ class CompanyStatementController extends ThinkController if(is_array($dbres['statement_info'])) { foreach ($dbres['statement_info'] as $key => $value) { + + $dbres['pay_amount_other'] += $value['platform_money']; + if ($value['game_name'] == "罚款" || $value['game_name'] == "奖励") { $dbres['statement_info'][$key]['pay_amount'] = "-"; } - $real_statement_amount - = number_format($value['platform_money']*(1-$value['promote_ratio']/100)*($value['ratio']/100)*(1-$value["fax_ratio"]/100),2,'.','');; + = number_format(($value['platform_money']+$value['aggregate_money'])*(1-$value['promote_ratio']/100)*($value['ratio']/100)*(1-$value["fax_ratio"]/100),2,'.',''); + if (!$dbres['statement_info'][$key]['other_amount']) { $dbres['statement_info'][$key]['other_amount'] = number_format($value["sum_money"] - $real_statement_amount,2,'.',''); } @@ -680,7 +683,7 @@ class CompanyStatementController extends ThinkController $statement_info[$k]['sum_amount'] = $v["platform_money"] + $v["aggregate_money"] ; $real_statement_amount - = number_format($v['platform_money']*(1-$v['promote_ratio']/100)*($v['ratio']/100)*(1-$v["fax_ratio"]/100),2,'.','');; + = number_format(($v['platform_money']+$value['aggregate_money'])*(1-$v['promote_ratio']/100)*($v['ratio']/100)*(1-$v["fax_ratio"]/100),2,'.',''); if (!$statement_info[$k]['other_amount']) { $statement_info[$k]['other_amount'] = number_format($v["sum_money"] - $real_statement_amount,2,'.',''); } diff --git a/Application/Admin/View/CompanyStatement/editWmCpStatement.html b/Application/Admin/View/CompanyStatement/editWmCpStatement.html index e292a9d01..cff930076 100644 --- a/Application/Admin/View/CompanyStatement/editWmCpStatement.html +++ b/Application/Admin/View/CompanyStatement/editWmCpStatement.html @@ -210,12 +210,12 @@ 渠道费率 税费费率 其他 - 结算金额 - - - - 结算金额=平台总额*(1-渠道费)*分成比例*(1-税费费率) + 结算金额 + + + + @@ -373,11 +373,11 @@ ${it.statement_begin_time}~${it.statement_end_time} ${it.game_name} {@if it.statement_type==1} - -${it.pay_amount}元 + -${it.platform_money}元 {@else} - ${it.pay_amount}元 + ${it.platform_money}元 {@/if} - ${it.aggregate_money} + ${it.aggregate_money}元 {@if it.statement_type==0} % @@ -404,7 +404,7 @@ 合计 - ${pay_amount}元 + ${pay_amount_other}元