聚合订单代码导出，及重算功能修改

Application/Admin/Controller/AggregateFinanceSetController.class.php

@@ -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'];
-					$v['pay_type'] =0;
-				}
+//				$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;
 			}
 

Application/Admin/Controller/AggregateFinanceStatementController.class.php

@@ -205,6 +205,15 @@ class AggregateFinanceStatementController extends ThinkController
         }else{
             $cpCompany =  M("aggregate_statement","tab_")->field("id,second_party_info")->where("id={$CompanyId}")->find();
             $info = json_decode($cpCompany['second_party_info'],true);
+
+//            $info['link_man'] = $info['connection_person'];
+//            $info['link_phone'] = $info['phone'];
+//            $info['address'] = $info['send_address'];
+//            $info['company_tax_no'] = $info['tax_identification_number'];
+//
+//            $info['payee_name'] = $info['bank_user'];
+//            $info['bank_account'] = $info['bank_card'];
+//            $info['company_tax_no'] = $info['tax_identification_number'];
         }
         $info['invoice_item'] = "信息技术服务费";
         $info['invoice_type'] = "增值税专用发票";
@@ -576,14 +585,27 @@ 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']);//邮寄地址
 
+        //开票信息
+        $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);//乙方
+
+
         $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']);//开户行