Merge branch 'dev-wgg' of wugg/cxinv into dev

app/admin/command/GetOrderInfoAndInvoiceInfo.php

@@ -168,7 +168,13 @@ class GetOrderInfoAndInvoiceInfo extends Command
     }
     private function updateGood($data,$invNo,$status=4){
 			if(empty($data))return;
-			if($status==6)$invNo =Db::name("invoice_red")->where(["invRed"=>$invNo,"is_del"=>0])->value("invNo",'');
+			if($status==6){
+				$invinfo =Db::name('invoice_red')->where(['invRed'=>$invNo,'is_del'=>0])->findOrEmpty();
+				$invNo = $invinfo['invNo']??'';
+				if(!key_exists('ZXBM' , $data[0])){
+					$data = $invinfo['DDMXXX']?json_decode($invinfo['DDMXXX'],true):[];
+				}
+			}
 			foreach ($data as $value){
 				if($value['ZXBM']!=''){
 					$invinfo =Db::name("invoice_good")->where(["invNo"=>$invNo,"id"=>$value['ZXBM'],'is_del'=>0])->findOrEmpty();

app/admin/command/QueryInvalidInvoice.php

@@ -24,7 +24,7 @@ class QueryInvalidInvoice extends Command
     {
 		$generrateinvoice= Cache::store("redis")->get("queryinvalidinvoice");
 	    if($generrateinvoice==1) return '';
-	    	Cache::store("redis")->set("queryinvalidinvoice",1,180);
+	    Cache::store("redis")->set("queryinvalidinvoice",1,180);
     	$date=date("Y-m-d H:i:s");
     	Db::startTrans();
     	try{

app/admin/controller/OrderInv.php

@@ -939,25 +939,6 @@ class OrderInv extends BaseController{
             if($up){
             	if($status==1){
             		if($return_type==1){
-//            			$discard=0;
-//	                    if(date("Y-m-d",strtotime($ticket["open_date"]))==date("Y-m-d")){
-//	                    	//当月纸质普通发票+纸质专用发票 作废
-//	                    	if(in_array($ticket['inv_type'],['004','007'])){
-//			                    $discard=1;
-////			                    $result= $this->addDiscard($ticket,$returnCode);
-//			                    if(in_array($ticket['inv_type'],['007','026'])) $result= $this->addRedOpen($ticket,2, $invinfo['company_type'], $returnCode);
-//
-//		                    }
-//
-//	                    	//当月电子普票红冲
-//	                    	if($ticket['inv_type']=='026')$result= $this->addRedOpen($ticket,$return_reason,$invinfo['company_type'], $returnCode);
-//	                    	//当月电子专票红冲
-//	                    	if($ticket['inv_type']=='028')$result=  $this->addApplyRed($ticket,$returnCode);
-//	                    }else{
-//	                    	//跨月票都走红冲
-//	                    	if(in_array($ticket['inv_type'],['007','026'])) $result= $this->addRedOpen($ticket,$return_reason,$invinfo['company_type'], $returnCode);
-//	                    	if(in_array($ticket['inv_type'],['004','028'])) $result= $this->addApplyRed($ticket,$returnCode);
-//	                    }
 	                    if(in_array($ticket['inv_type'],['007','026'])) $result= $this->addRedOpen($ticket,$return_reason,$invinfo['company_type'],$returnCode,$red_desc);
 	                    if(in_array($ticket['inv_type'],['004','028'])) $result= $this->addApplyRed($ticket,$return_reason,$returnCode,$red_desc);
 						if(isset($result['code'])){
@@ -2608,17 +2589,17 @@ class OrderInv extends BaseController{
     	"customerName"=>"","fphm"=>"","fplxdm"=>"","status"=>""],"post","trim");
     	$where=[];
     	$model = new InvoiceInterface();
-    	$param['kpfs']??$where[]=["KPFS","=",$param['kpfs']];
-    	$param['kplx']??$where[]=["KPLX","=",$param['kplx']];
-    	$param['fplxdm']??$where[]=["FPLXDM","=",$param['fplxdm']];
-    	$param['status']??$where[]=["status","=",$param['status']];
-    	$param['invNo']??$where[]=["invNo","like","%{$param['invNo']}%"];
+    	$param['kpfs']==''?:$where[]=['KPFS','=',$param['kpfs']];
+    	$param['kplx'] == ''?:$where[]=['KPLX','=',$param['kplx']];
+    	$param['fplxdm'] == ''?:$where[]=['FPLXDM','=',$param['fplxdm']];
+    	$param['status'] === ''?:$where[]=['status','=',$param['status']];
+    	$param['invNo'] == ''?:$where[]=['invNo','like',"%{$param['invNo']}%"];
     	if($param['companyNo']!=''){
-    	  $sbh  = Db::name("company_info")->where("companyNo",$param['companyNo'])->value("company_license",'');
-    	   $where[]=["XHFSBH","=",$sbh];
+    	  $sbh  = Db::name('company_info')->where('companyNo',$param['companyNo'])->value('company_license','');
+    	   $where[]=['XHFSBH','=',$sbh];
     	}
-    	$param['customerName']??$where[]=["GMFMC","like","%{$param['customerName']}%"];
-    	$param['fphm']??$where[]=["YFPHM","like","%{$param['fphm']}%"];
+    	$param['customerName'] == ''?:$where[]=['GMFMC','like',"%{$param['customerName']}%"];
+    	$param['fphm'] == ''?:$where[]=['YFPHM','like',"%{$param['fphm']}%"];
     	$list = $model->where($where)
     	->field("id,invNo,KPLX,KPFS,FPLXDM,XHFMC,XHFSBH,GMFSBH,GMFMC,KPR,SKR,FHR,YFPDM,YFPHM,YFPLX,YFPKPRQ,JSHJ,
     	HJJE,HJSE,status,remark,updatetime,addtime")->order("id desc")->paginate(["list_rows"=>$param["size"],"page"=>$param['page']]);