diff --git a/Application/Admin/Controller/CompanyStatementController.class.php b/Application/Admin/Controller/CompanyStatementController.class.php index 3895bd401..05b3b4f10 100644 --- a/Application/Admin/Controller/CompanyStatementController.class.php +++ b/Application/Admin/Controller/CompanyStatementController.class.php @@ -1446,8 +1446,10 @@ class CompanyStatementController extends ThinkController $statement_info[$k]['statement_type'] = 0; $statement_info[$k]['fax_ratio'] = $company_data['fax_ratio']; - } + $statement_info[$k]['statement_begin_time'] = dateFormat($v['statement_begin_time']); + $statement_info[$k]['statement_end_time'] = dateFormat($v['statement_end_time']); + } if ($company_data['company_type'] == 2) { @@ -1493,8 +1495,8 @@ class CompanyStatementController extends ThinkController $game_list['ratio'] = $v['ratio']; $game_list['fax_ratio'] = $company_data['fax_ratio']; - $game_list['sum_money'] = number_format(($aval['pay_amount']*($v['increment_ratio']))/100,2,'.',''); - $game_list['increment_ratio'] = number_format($v['increment_ratio'],2,'.',''); + $game_list['sum_money'] = ($aval['pay_amount']*($v['increment_ratio']))/100; + $game_list['increment_ratio'] = $v['increment_ratio']; $game_list['statement_begin_time'] = $v['statement_begin_time']; $game_list['statement_end_time'] = $v['statement_end_time']; $game_list['statement_type'] = '0'; diff --git a/Application/Admin/View/CompanyStatement/viewPcStatement.html b/Application/Admin/View/CompanyStatement/viewPcStatement.html index 5f98dd1db..32dfe40df 100644 --- a/Application/Admin/View/CompanyStatement/viewPcStatement.html +++ b/Application/Admin/View/CompanyStatement/viewPcStatement.html @@ -241,12 +241,13 @@ 合计 - - - + {$data['statement_count']['pay_amount']-0} + + + {$data['statement_count']['statement_money']-0} diff --git a/Application/Admin/View/CompanyStatement/viewPuComplementStatement.html b/Application/Admin/View/CompanyStatement/viewPuComplementStatement.html index 2045e341c..44181396d 100644 --- a/Application/Admin/View/CompanyStatement/viewPuComplementStatement.html +++ b/Application/Admin/View/CompanyStatement/viewPuComplementStatement.html @@ -147,7 +147,7 @@ {$it['account']} {$it['game_list'][0]['game_name']} {$it['game_list'][0]['game_type_name']} - {$it['game_list'][0]['statement_begin_time']|dateFormat}~{$it['game_list'][0]['statement_end_time']|dateFormat} + {$it['game_list'][0]['statement_begin_time']}~{$it['game_list'][0]['statement_end_time']} {$it['game_list'][0]['pay_amount']} {$it['game_list'][0]['increment_ratio']}%