Merge pull request 'feature/out_change_OFFICIEL_CHANNEL' (#303) from feature/out_change_OFFICIEL_CHANNEL into master_out

优化默认公司
master
陈志 4 years ago
commit 085b7dd461

@ -112,7 +112,7 @@ return array(
'TMPL_ACTION_SUCCESS' => MODULE_PATH.'View/Public/success.html', // 默认成功跳转对应的模板文件 'TMPL_ACTION_SUCCESS' => MODULE_PATH.'View/Public/success.html', // 默认成功跳转对应的模板文件
'TMPL_EXCEPTION_FILE' => MODULE_PATH.'View/Public/exception.html',// 异常页面的模板文件 'TMPL_EXCEPTION_FILE' => MODULE_PATH.'View/Public/exception.html',// 异常页面的模板文件
/*默认公司名称*/ /*默认公司名称*/
'DEFAULT_COMPANY'=>"海南万盟天下科技有限公司", 'DEFAULT_COMPANY'=>"福建基远通讯科技有限公司",
'OFFICIEL_CHANNEL'=>"福建基远通讯科技有限公司", 'OFFICIEL_CHANNEL'=>"福建基远通讯科技有限公司",
/*分库的表格*/ /*分库的表格*/
'SUBSITE_TABLE'=>[ 'SUBSITE_TABLE'=>[

@ -517,7 +517,8 @@ class CompanyStatementSetController extends Controller {
"company_type"=>1 "company_type"=>1
]; ];
//获取pc公司 //获取pc公司
$company = M("CompanyInfo","tab_")->field("id,partner,link_man,link_phone,address,company_tax_no,payee_name,bank_account,opening_bank")->where("partner = '海南万盟天下科技有限公司'")->find(); $company_defualt = C("DEFAULT_COMPANY");
$company = M("CompanyInfo","tab_")->field("id,partner,link_man,link_phone,address,company_tax_no,payee_name,bank_account,opening_bank")->where("partner = '{$company_defualt}'")->find();
$first_party_info = json_encode($company,JSON_UNESCAPED_UNICODE); $first_party_info = json_encode($company,JSON_UNESCAPED_UNICODE);
$company['partner'] = C("OFFICIEL_CHANNEL"); $company['partner'] = C("OFFICIEL_CHANNEL");
$second_party_info = json_encode($company,JSON_UNESCAPED_UNICODE); $second_party_info = json_encode($company,JSON_UNESCAPED_UNICODE);

Loading…
Cancel
Save