From f18f3ce7e223088e2856083439e4940181b602a2 Mon Sep 17 00:00:00 2001
From: zhengyongxing <as123498@qq.com>
Date: Fri, 28 Aug 2020 19:49:35 +0800
Subject: [PATCH] =?UTF-8?q?=E6=AF=94=E4=BE=8B=E4=B8=8E=E6=97=A5=E6=9C=9F?=
 =?UTF-8?q?=E6=A0=BC=E5=BC=8F=E4=BF=AE=E6=AD=A3?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

---
 .../Admin/Controller/CompanyStatementController.class.php | 8 +++++---
 .../Admin/View/CompanyStatement/viewPcStatement.html      | 7 ++++---
 .../View/CompanyStatement/viewPuComplementStatement.html  | 2 +-
 3 files changed, 10 insertions(+), 7 deletions(-)

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 @@
 
                     <tr>
                         <td>合计</td>
-                        <if condition="$data['withdraw_type'] eq 3">
-                        <td></td>
-                        </if>
+
                         <td></td>
                         <td>{$data['statement_count']['pay_amount']-0}</td>
                         <td></td>
+                        <if condition="$data['withdraw_type'] eq 3">
+                            <td></td>
+                        </if>
                         <td></td>
                         <td>{$data['statement_count']['statement_money']-0}</td>
                     </tr>
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 @@
                             <td rowspan="{$it['row']}">{$it['account']}</td>
                             <td>{$it['game_list'][0]['game_name']}</td>
                             <td>{$it['game_list'][0]['game_type_name']}</td>
-                            <td>{$it['game_list'][0]['statement_begin_time']|dateFormat}~{$it['game_list'][0]['statement_end_time']|dateFormat}</td>
+                            <td>{$it['game_list'][0]['statement_begin_time']}~{$it['game_list'][0]['statement_end_time']}</td>
                             <td>{$it['game_list'][0]['pay_amount']}</td>
                             <if condition="$data['withdraw_type'] eq 2">
                                 <td>{$it['game_list'][0]['increment_ratio']}%</td>