From b39629fe0824ee83e9ebab879779470d2c136617 Mon Sep 17 00:00:00 2001 From: zhengyongxing Date: Wed, 2 Sep 2020 19:52:13 +0800 Subject: [PATCH] =?UTF-8?q?=E8=A1=A5=E7=82=B9=E5=8A=9F=E8=83=BD=E4=BF=AE?= =?UTF-8?q?=E6=AD=A3?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- .../Controller/AggregateFinanceStatementController.class.php | 2 +- .../Admin/Controller/CompanyStatementController.class.php | 4 ++-- Application/Admin/Controller/TimingController.class.php | 4 ++-- 3 files changed, 5 insertions(+), 5 deletions(-) diff --git a/Application/Admin/Controller/AggregateFinanceStatementController.class.php b/Application/Admin/Controller/AggregateFinanceStatementController.class.php index 3a71b06a4..4db9c689c 100644 --- a/Application/Admin/Controller/AggregateFinanceStatementController.class.php +++ b/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']; diff --git a/Application/Admin/Controller/CompanyStatementController.class.php b/Application/Admin/Controller/CompanyStatementController.class.php index 042994766..f0fd336da 100644 --- a/Application/Admin/Controller/CompanyStatementController.class.php +++ b/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_") diff --git a/Application/Admin/Controller/TimingController.class.php b/Application/Admin/Controller/TimingController.class.php index 5e4b29704..720765752 100644 --- a/Application/Admin/Controller/TimingController.class.php +++ b/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']}";