wugg 2 лет назад
Родитель
Сommit
156935c5e6

+ 0 - 1
app/admin/command/GetOrderInfoAndInvoiceInfo.php

@@ -34,7 +34,6 @@ class GetOrderInfoAndInvoiceInfo extends Command
 						Db::name("invoice_red")->where(["invRed"=>$value['invNo'],"is_del"=>0])->update(["status"=>4,"updatetime"=>date("Y-m-d H:i:s")]);
 						Db::name("invoice_pool")->where(["invNo"=>$red['invNo'],"is_del"=>0])->update(["status"=>8,"updatetime"=>date("Y-m-d H:i:s")]);
 					}
-
 				}else{
 					Db::name("invoice_pool")->where(["invNo"=>$value['invNo'],"is_del"=>0])->update(["status"=>2,"updatetime"=>date("Y-m-d H:i:s")]);
 				}

+ 3 - 3
app/admin/controller/OrderInv.php

@@ -493,13 +493,13 @@ class OrderInv extends BaseController{
 		if(!in_array($invinfo['status'],[1,2,3,5]))return  error_show(1004,"发票状态无法废弃");
 		$company =Db::name("company_info")->where(["companyNo"=>$invinfo['inv_out']])->find();
 		if($company==false)return  error_show(1004,"开票业务公司未找到");
-		$invoice =Db::name("invoice_ticket")->where(["invNo"=>$invNo])->find();
-		if($invoice==false)return  error_show(1004,"发票详细信息未找到");
+		$invoiceinfo =Db::name("invoice_ticket")->where(["invNo"=>$invNo])->find();
+		if($invoiceinfo==false)return  error_show(1004,"发票详细信息未找到");
 		Db::startTrans();
 		try{
 		$invoice=Config::get("invoice");
     	$tax =new \TaxInvoice($invoice['appKey'],$invoice['appSecret'],$invoice['entCode']);
-		 $result=$tax->DeprecateInvoices($company['company_license'],invoiceType($invinfo['inv_type']),$invoice['inv_code'],$invoice['inv_number'],1);
+		 $result=$tax->DeprecateInvoices($company['company_license'],invoiceType($invoiceinfo['inv_type']),$invoiceinfo['inv_code'],$invoiceinfo['inv_number'],1);
 		 if(isset($result['ZTDM']) && $result['ZTDM']=='050000'){
 			 $up =Db::name("invoice_pool")->where($invinfo)->update(["status"=>6,"updatetime"=>date("Y-m-d H:i:s")]);
 			 if($up){