elf
/
cf-platform
1
0
Fork 0
Code Issues Pull Requests Packages Projects Releases Wiki Activity

财务代码搬到新的分支上

Browse Source
master
zhengyongxing 4 years ago
parent 341fa19b6f
commit 1fff2e6c09
4 changed files with 201 additions and 134 deletions
Show Stats Download Patch File Download Diff File

65
Application/Admin/Controller/AggregateFinanceSetController.class.php
Unescape Escape View File

@ -112,6 +112,8 @@ class AggregateFinanceSetController extends Controller {
];
$dataurl .= $this->apihost."&".http_build_query($arr);
$html = file_get_contents($dataurl);
// echo $dataurl;die();
sleep(5);
$rsp = json_decode($html,true);
if($rsp['code'] != 1){
echo $rsp['error'].PHP_EOL;die;
@ -135,8 +137,20 @@ class AggregateFinanceSetController extends Controller {
$v['create_time'] = time();
$v['admin_name'] = "system";
$v['admin_id'] = 0;
$v['second_party_info'] = json_encode([
"partner"=>$v['channel_name']
$v['second_party_info'] =
json_encode([
"partner"=>$v['channel_name'],
"invoice_type"=>$v['invoice_type'],
"invoice_item"=>$v['invoice_item'],
"company_tax_no"=>$v['tax_identification_number'],
"link_man"=>$v['connection_person'],
"link_phone"=>$v['phone'],
"address"=>$v['send_address'],
"register_address"=>$v['register_address'],
"register_phone"=>$v['register_phone'],
"payee_name"=>$v['bank_user'],
"bank_account"=>$v['bank_card'],
"opening_bank"=>$v['bank_name'],
],JSON_UNESCAPED_UNICODE);
$Aggregate->add($v);
}
@ -193,12 +207,48 @@ class AggregateFinanceSetController extends Controller {
$v['admin_id'] = $_SESSION['onethink_admin']['user_auth']['uid'];
$v['verify_status'] = 0;
$first_party_info = json_decode($info['first_party_info'], 1);
if($first_party_info['partner'] == $info['channel_name']){
$v['second_party_info'] = $info['first_party_info'];
$v['first_party_info'] = $info['second_party_info'];
// $first_party_info = json_decode($info['first_party_info'], 1);
// if($first_party_info['partner'] == $info['channel_name']){
$v['second_party_info'] =
json_encode([
"partner"=>$v['channel_name'],
"invoice_type"=>$v['invoice_type'],
"invoice_item"=>$v['invoice_item'],
"company_tax_no"=>$v['tax_identification_number'],
"link_man"=>$v['connection_person'],
"link_phone"=>$v['phone'],
"address"=>$v['send_address'],
"register_address"=>$v['register_address'],
"register_phone"=>$v['register_phone'],
"payee_name"=>$v['bank_user'],
"bank_account"=>$v['bank_card'],
"opening_bank"=>$v['bank_name'],
],JSON_UNESCAPED_UNICODE);
$v['first_party_info'] = '';
$v['pay_type'] =0;
}
// } else {
// $v['second_party_info'] =
// json_encode([
// "partner"=>$v['channel_name'],
// "invoice_type"=>$v['invoice_type'],
// "invoice_item"=>$v['invoice_item'],
// "company_tax_no"=>$v['tax_identification_number'],
// "link_man"=>$v['connection_person'],
// "link_phone"=>$v['phone'],
// "address"=>$v['send_address'],
// "register_address"=>$v['register_address'],
// "register_phone"=>$v['register_phone'],
// "payee_name"=>$v['bank_user'],
// "bank_account"=>$v['bank_card'],
// "opening_bank"=>$v['bank_name'],
// ],JSON_UNESCAPED_UNICODE);
//
// $v['pay_type'] =1;
// }
$res = $Aggregate->where("id='{$id}'")->save($v);
if(empty($res)){
@ -220,6 +270,7 @@ class AggregateFinanceSetController extends Controller {
if($first_party_info['partner'] == $info['channel_name']){
$savedata['second_party_info'] = $info['first_party_info'];
$savedata['first_party_info'] = $info['second_party_info'];
$savedata['pay_type'] =0;
}

26
Application/Admin/Controller/AggregateFinanceStatementController.class.php
Unescape Escape View File

@ -576,17 +576,33 @@ class AggregateFinanceStatementController extends ThinkController
$objPHPExcel->getActiveSheet()->setCellValue('B'.($line+3), $data['first_party_info']['partner']);//甲方
$objPHPExcel->getActiveSheet()->setCellValue('B'.($line+4), $data['first_party_info']['link_man']);//联系人
$objPHPExcel->getActiveSheet()->setCellValue('B'.($line+5), $data['first_party_info']['link_phone']);//联系电话
$objPHPExcel->getActiveSheet()->setCellValue('B'.($line+6), $data['second_party_info']['invoice_item']);//开票项目
$objPHPExcel->getActiveSheet()->setCellValue('B'.($line+7), $data['second_party_info']['invoice_type']);//发票类型
$objPHPExcel->getActiveSheet()->setCellValue('B'.($line+6), $data['first_party_info']['address']);//邮寄地址
// $objPHPExcel->getActiveSheet()->setCellValue('B'.($line+7), $data['second_party_info']['invoice_type']);//发票类型
//乙方信息
$objPHPExcel->getActiveSheet()->setCellValue('E'.($line+3), $data['second_party_info']['partner']);//乙方
$objPHPExcel->getActiveSheet()->setCellValue('E'.($line+4), $data['second_party_info']['link_man']);//联系人
$objPHPExcel->getActiveSheet()->setCellValue('E'.($line+5), $data['second_party_info']['link_phone']);//联系电话
$objPHPExcel->getActiveSheet()->setCellValue('E'.($line+6), $data['second_party_info']['address']);//邮寄地址
$objPHPExcel->getActiveSheet()->setCellValue('E'.($line+8), $data['pay_company']['payee_name']);//户名
$objPHPExcel->getActiveSheet()->setCellValue('E'.($line+9), $data['pay_company']['bank_account']);//银行账号
$objPHPExcel->getActiveSheet()->setCellValue('E'.($line+10), $data['pay_company']['opening_bank']);//开户行
//开票信息
$invoice_data = "发票类型：".$data['second_party_info']['invoice_type'];
$invoice_data .= "\n发票抬头：".$data['second_party_info']['partner'];
$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']['invoice_item'];
$invoice_data .= "\n注册地址及电话：".$data['second_party_info']['register_address'].",".$data['second_party_info']['register_phone'];
$objPHPExcel->getActiveSheet()->setCellValue('B'.($line+7), $invoice_data);//乙方
$first_data = "户名：{$data['pay_company']['payee_name']}";
$first_data .= "\n账号：{$data['pay_company']['bank_account']}";
$first_data .= "\n开户行：{$data['pay_company']['opening_bank']}";
$objPHPExcel->getActiveSheet()->setCellValue('B'.($line+8), $first_data);//户名
// $objPHPExcel->getActiveSheet()->setCellValue('E'.($line+8), $data['pay_company']['payee_name']);//户名
// $objPHPExcel->getActiveSheet()->setCellValue('E'.($line+9), $data['pay_company']['bank_account']);//银行账号
// $objPHPExcel->getActiveSheet()->setCellValue('E'.($line+10), $data['pay_company']['opening_bank']);//开户行
if($data['withdraw_type'] == 1){
$m = date('Y.m', $data['begintime']);
$fileName = "{$data['second_party_info']['partner']}&{$data['first_party_info']['partner']}-对账单{$m}";

4
Application/Admin/Model/PromoteModel.class.php
Unescape Escape View File

@ -442,9 +442,9 @@ class PromoteModel extends Model{
if(!$show_data_power){
$parseData[$key]['account'] = encryptStr($parseData[$key]['account']);
// $parseData[$key]['account'] = encryptStr($parseData[$key]['account']);
$parseData[$key]['mobile_phone'] = encryptStr($parseData[$key]['mobile_phone']);
$parseData[$key]['top_account'] = encryptStr($parseData[$key]['top_account']);
// $parseData[$key]['top_account'] = encryptStr($parseData[$key]['top_account']);
}

BIN
Public/Admin/excel/aggregate_stream.xls
View File

Binary file not shown.
Write Preview
Loading…
Cancel
Save