Merge branch 'feature/finance_statement_three' of wmtx/platform into master

优化下游内团江息网络归属
master
万盟天下 4 years ago committed by Gogs
commit 2e7caa0408

@ -499,10 +499,13 @@ class CompanyStatementSetController extends Controller {
]; ];
//获取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 = M("CompanyInfo","tab_")->field("id,partner,link_man,link_phone,address,company_tax_no,payee_name,bank_account,opening_bank")->where("partner = '海南万盟天下科技有限公司'")->find();
$first_party_info = json_encode($company,JSON_UNESCAPED_UNICODE);
$company['partner'] = C("OFFICIEL_CHANNEL");
$second_party_info = json_encode($company,JSON_UNESCAPED_UNICODE);
$add_data=[ $add_data=[
"first_party_info"=>json_encode($company,JSON_UNESCAPED_UNICODE), "first_party_info"=>$first_party_info,
"second_party_info"=>json_encode($company,JSON_UNESCAPED_UNICODE), "second_party_info"=>$second_party_info,
"pay_type"=>1, "pay_type"=>2,
"withdraw_type"=>1, "withdraw_type"=>1,
"statement_begin_time"=>$begintime, "statement_begin_time"=>$begintime,
"statement_end_time"=>$endtime, "statement_end_time"=>$endtime,
@ -514,7 +517,7 @@ class CompanyStatementSetController extends Controller {
"is_payment"=>2, "is_payment"=>2,
"statement_info"=>[], "statement_info"=>[],
"company_belong"=>0, "company_belong"=>0,
"company_name"=>'海南万盟天下科技有限公司', "company_name"=>C("OFFICIEL_CHANNEL"),
"company_id"=>0, "company_id"=>0,
"company_type"=>1 "company_type"=>1
]; ];

Loading…
Cancel
Save