ad

app/admin/command/QueryInvalidInvoice.php

@@ -26,20 +26,21 @@ class QueryInvalidInvoice extends Command
     	$date=date("Y-m-d H:i:s");
     	Db::startTrans();
     	try{
-    	$data =Db::name("invoice_return")->where(["status"=>1,"red_inv"=>"","is_del"=>0])->where("updatetime","<=",date("Y-m-d H:i:s"))->findOrEmpty();
+    	$data =Db::name("invoice_return")->where(["status"=>1,"discard"=>2,"is_del"=>0])->where("updatetime","<=",date("Y-m-d H:i:s"))->findOrEmpty();
     	if(empty($data))return;
-    	$invoiceInfo = Db::name("invoice_ticket")->where(["invNo"=>$data['invNo'],"is_del"=>0,"status"=>1])
-    	->findOrEmpty();
+    	$invoiceInfo = Db::name("invoice_ticket")->where(["invNo"=>$data['invNo'],"is_del"=>0,"status"=>1])->findOrEmpty();
     	if(empty($invoiceInfo))throw new \Exception("未找到开票数据");
 		$check=$this->ChickInvoice($invoiceInfo['seller_id'],$invoiceInfo['inv_code'],$invoiceInfo['inv_number']);
 		if(isset($check['ZTDM']) && $check['ZTDM']=='001000') {
-			$reups=Db::name("invoice_return")->where($data)->update(["status"=>1,"remark"=>$data['remark']."({$check['ZTXX']})","updatetime"=>date("Y-m-d H:i:s",time()+120)]);
+			$reups=Db::name("invoice_return")->where($data)->update(["discard"=>2,"remark"=>$data['remark']."({$check['ZTXX']})","updatetime"=>date("Y-m-d H:i:s",time()+120)]);
 			if($reups==false)throw new \Exception("退票数据更新失败");
 			throw new \Exception("发票作废中");
 		}
 		if(isset($check['ZTDM']) && $check['ZTDM']=='000000'){
-			$reup=Db::name("invoice_return")->where($data)->update(["status"=>2,"updatetime"=>date("Y-m-d H:i:s")]);
+			$reup=Db::name("invoice_return")->where($data)->update(["status"=>2,"discard"=>1,"updatetime"=>date("Y-m-d H:i:s")]);
 			if($reup==false)throw new \Exception("退票数据更新失败");
+			$ticket =  Db::name("invoice_ticket")->where(["invNo"=>$data['invNo'],"is_del"=>0,"status"=>1])->update(["status"=>2,"updatetime"=>date("Y-m-d H:i:s")]);
+			if($ticket==false)throw new \Exception("退票数据更新失败");
 			  $qrdArr=Db::name("assoc")->where(["viceCode"=>$data['invNo'],"is_del"=>0,"status"=>2])->column("id,orderCode,cancel_fee");
                      if(!empty($qrdArr)){
                           foreach ($qrdArr as $value){

app/admin/controller/OrderInv.php

@@ -932,7 +932,7 @@ class OrderInv extends BaseController{
 	                if($up==false)throw new \Exception('发票废弃中，信息更新失败', 1006);
 	                return ["code"=>1,"message"=>"发票废弃中"];
     	 	    }else{
-    	 	    	$ups=Db::name("invoice_return")->where(['returnCode'=>$returnCode])->update(["status"=>2,"updatetime"=>date("Y-m-d H:i:s")]);
+    	 	    	$ups=Db::name("invoice_return")->where(['returnCode'=>$returnCode])->update(["status"=>2,"discard"=>1,"updatetime"=>date("Y-m-d H:i:s")]);
     	 	        if($ups==false)throw new \Exception('发票已废弃，信息更新失败', 1006);
 			        $up =Db::name("invoice_pool")->where(['invNo'=>$ticket['invNo']])->update(["status"=>6,"updatetime"=>date("Y-m-d H:i:s")]);
 				    if($up==false)throw new \Exception('发票已废弃，信息更新失败', 1006);