Merge branch 'hotfix/bug_change_now' of wmtx/platform into master

补点功能修正

Application/Admin/Controller/AggregateFinanceStatementController.class.php

@@ -599,7 +599,7 @@ class AggregateFinanceStatementController extends ThinkController
         $invoice_data .= "\n纳税人识别号：".$data['second_party_info']['company_tax_no'];
 
         $invoice_data .= "\n开户银行：".$data['second_party_info']['opening_bank'];
-        $invoice_data .= "\n开户账号：".$data['second_party_info']['payee_name'];
+        $invoice_data .= "\n开户账号：".$data['second_party_info']['bank_account'];
         $invoice_data .= "\n开票内容：".$data['second_party_info']['invoice_item'];
         $invoice_data .= "\n注册地址及电话：".$data['second_party_info']['register_address'].",".$data['second_party_info']['register_phone'];
 

Application/Admin/Controller/CompanyStatementController.class.php

@@ -1470,8 +1470,8 @@ class CompanyStatementController extends ThinkController
                 $amount_time['pay_way'] = ['egt',0];
 
                 foreach ($statement_info as $k => $v) {
-                    $statement_begin_time = strtotime($v['statement_begin_time']);
-                    $statement_end_time = strtotime($v['statement_end_time'])+86399;
+                    $statement_begin_time = strtotime(str_replace('.','-',$v['statement_begin_time']));
+                    $statement_end_time = strtotime(str_replace('.','-',$v['statement_end_time']))+86399;
                     $amount_time['_string'] = "payed_time between {$statement_begin_time} and {$statement_end_time} and relation_game_id={$v['relation_game_id']}";
 
                     $dataAmount = M("spend","tab_")

Application/Admin/Controller/TimingController.class.php

@@ -790,8 +790,8 @@ class TimingController extends AdminController {
                 $compamy_info = M("promote","tab_")->where(['id'=>$promote_id,'company_id'=>$value['company_id']])->find();
                 if ($compamy_info) {
                     foreach ($statement_info as $k => $v) {
-                        $statement_begin_time = strtotime($v['statement_begin_time']);
-                        $statement_end_time = strtotime($v['statement_end_time'])+86399;
+                        $statement_begin_time = strtotime(str_replace('.','-',$v['statement_begin_time']));
+                        $statement_end_time = strtotime(str_replace('.','-',$v['statement_end_time']))+86399;
                         $amount_time['tab_spend.pay_status'] = 1;
                         $amount_time['pay_way'] = ['egt',0];
                         $amount_time['_string'] = "payed_time between {$statement_begin_time} and {$statement_end_time} and relation_game_id={$v['relation_game_id']}";