From 02150820185fabd61b744c135d81fda0cad2247f Mon Sep 17 00:00:00 2001 From: zhengyongxing Date: Wed, 26 Aug 2020 14:51:37 +0800 Subject: [PATCH] =?UTF-8?q?=E7=89=B9=E6=AE=8A=E8=A1=A5=E7=82=B9bug?= =?UTF-8?q?=E4=BF=AE=E6=AD=A3?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- .../CompanyStatementController.class.php | 20 ++++++++----------- .../CompanyStatementPoolController.class.php | 8 +++++++- 2 files changed, 15 insertions(+), 13 deletions(-) diff --git a/Application/Admin/Controller/CompanyStatementController.class.php b/Application/Admin/Controller/CompanyStatementController.class.php index f9f7f3350..913755f0f 100644 --- a/Application/Admin/Controller/CompanyStatementController.class.php +++ b/Application/Admin/Controller/CompanyStatementController.class.php @@ -645,8 +645,6 @@ class CompanyStatementController extends ThinkController $StatementInfo = M("company_statement_info","tab_"); $company_info = $va['company_info']; - - $LackStatement = M("company_lack_statement_info","tab_"); $no_pool_money = 300; //统一比例字段 @@ -806,16 +804,13 @@ class CompanyStatementController extends ThinkController } if (isset($v['company_info']['company_belong'])) { - if($v['company_info']['company_belong'] == '0') { - $v['company_info']['company_relation_str'] = '内团'; - } elseif($v['company_info']['company_belong'] == '1') { - $v['company_info']['company_relation_str'] = '外团'; - }elseif($v['company_info']['company_belong'] == '2') { - $v['company_info']['company_relation_str'] = '分发联盟'; - }elseif($v['company_info']['company_belong'] == '3') { - $v['company_info']['company_relation_str'] = '无'; - } + $v['company_info']['company_belong_str'] = getCompanyBlong($v['company_info']['company_belong']); } + + if (isset($v['company_info']['develop_type'])) { + $v['company_info']['company_relation_str'] = getCompanyRelation($v['company_info']['develop_type']); + } + //先分配好订单号，防止重复提交 $tdata = [ "company_info"=>$v['company_info'], @@ -1222,7 +1217,8 @@ class CompanyStatementController extends ThinkController $proCompany_info['taxation_rate'] = $company_data['taxation_rate']; $proCompany_info['company_belong'] = $company_data['company_belong']; - $proCompany_info['company_type'] =$company_data['company_type']; + $proCompany_info['company_type'] = $company_data['company_type']; + $proCompany_info['develop_type'] = $company_data['develop_type']; $proCompany_info['ali_user'] = $company_data['ali_user']; $proCompany_info['ali_account'] =$company_data['ali_account']; $proCompany_info['has_server_fee'] = $company_data['has_server_fee']; diff --git a/Application/Admin/Controller/CompanyStatementPoolController.class.php b/Application/Admin/Controller/CompanyStatementPoolController.class.php index 410e47346..25d7cecc0 100644 --- a/Application/Admin/Controller/CompanyStatementPoolController.class.php +++ b/Application/Admin/Controller/CompanyStatementPoolController.class.php @@ -286,7 +286,13 @@ class CompanyStatementPoolController extends ThinkController } $v['row'] = $row; if($is_export){ - $v['statement_money'] .="N{$cline}-O{$cline}"; + + if($v['withdraw_type'] != 3) { + $v['statement_money'] .="N{$cline}-O{$cline}"; + } else { + $v['statement_money'] = substr($v['statement_money'],0,strlen($v['statement_money'])-1); + } +// dump($v['statement_money']);die(); } }