From 02e7d85e44c4da59fc90fffe92360d4f1339a411 Mon Sep 17 00:00:00 2001 From: chenzhi Date: Thu, 4 Jun 2020 13:37:57 +0800 Subject: [PATCH] =?UTF-8?q?=E4=BC=98=E5=8C=96=E7=94=9F=E6=88=90=E7=BB=93?= =?UTF-8?q?=E7=AE=97=E5=8D=95?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- .../Admin/Controller/CompanyStatementSetController.class.php | 4 ++-- Data/update.sql | 2 ++ 2 files changed, 4 insertions(+), 2 deletions(-) diff --git a/Application/Admin/Controller/CompanyStatementSetController.class.php b/Application/Admin/Controller/CompanyStatementSetController.class.php index 813adf1bb..9a8934d31 100644 --- a/Application/Admin/Controller/CompanyStatementSetController.class.php +++ b/Application/Admin/Controller/CompanyStatementSetController.class.php @@ -131,7 +131,7 @@ class CompanyStatementSetController extends Controller { $cp_id = implode(",",array_flip(array_flip(array_keys($cpList)))); $js_id = implode(",",array_unique($js_id)); //获取cp公司 - $tmpp = M("Partner","tab_")->field("id,partner,link_man,link_phone,address,company_tax_no,payee_name,bank_account,opening_bank,channel_rate,invoice_rate,company_type")->where(["id"=>['in',$cp_id]])->select(); + $tmpp = M("Partner","tab_")->field("id,partner,link_man,link_phone,address,company_tax_no,payee_name,bank_account,opening_bank,channel_rate,invoice_rate,company_type,ali_user,ali_account")->where(["id"=>['in',$cp_id]])->select(); $cp =[]; foreach ($tmpp as $v) { $cp[$v['id']]=$v; @@ -438,7 +438,7 @@ class CompanyStatementSetController extends Controller { return ; } //获取pc公司 - $tmpp = M("PromoteCompany","tab_")->field("id,company_name partner,settlement_contact link_man,contact_phone link_phone,address,bank_address payee_name,bank_card bank_account,fax_ratio,company_belong,company_type")->where(["id"=>['in',$pc_id]])->select(); + $tmpp = M("PromoteCompany","tab_")->field("id,company_name partner,settlement_contact link_man,contact_phone link_phone,address,bank_address payee_name,bank_card bank_account,fax_ratio,company_belong,company_type,ali_user,ali_account")->where(["id"=>['in',$pc_id]])->select(); $pc =[]; foreach ($tmpp as $v) { $pc[$v['id']]=$v; diff --git a/Data/update.sql b/Data/update.sql index b9a588c6a..155cb730e 100644 --- a/Data/update.sql +++ b/Data/update.sql @@ -1931,6 +1931,8 @@ CREATE TABLE `tab_company_statement_info` ( `company_id` int(11) DEFAULT '0' COMMENT '对账公司id', `company_type` tinyint(3) NOT NULL DEFAULT '1' COMMENT '1上游cp,2联运下游', `company_name` varchar(60) NOT NULL DEFAULT '' COMMENT '对账公司名称', + `ali_user` varchar(64) NOT NULL DEFAULT '' COMMENT '支付宝真实名称', + `ali_account` varchar(128) NOT NULL DEFAULT '' COMMENT '支付宝登陆账号', `statement_money` decimal(10,2) DEFAULT '0.00' COMMENT '对账金额', `pay_amount` decimal(10,2) DEFAULT '0.00' COMMENT '总计',