ad

app/admin/controller/Sale.php

@@ -42,9 +42,9 @@ class Sale extends Base{
            $condition[]=["a.totalPrice","<=",$total_max];
         }
         if(isset($post['is_comon'])&&$post['is_comon']!=='') $condition []=['is_comon','=',$post['is_comon']];
-        $cxCode = isset($post['cxCode'])&&$post['cxCode']!==''?trim($post['cxCode']):'';
-        if($cxCode!==''){
-           $condition[]=["a.cxCode","=",$cxCode];
+        $cxCode =$post['cxCode']??[];
+        if(!empty($cxCode)){
+           $condition[]=["a.cxCode","in",$cxCode];
         }
         $inv_status =  isset($post['inv_status'])&&$post['inv_status']!==''?intval($post['inv_status']):'';
         if($inv_status!==''){
@@ -64,13 +64,22 @@ class Sale extends Base{
         }
         $payIs =  isset($post['pay_is'])&&$post['pay_is']!==''?intval($post['pay_is']):'';
         if($payIs!==''){
-        	if($invIs==1){
+        	if($payIs==1){
         		$condition[]=["a.wpay_fee","<>",0];
         	}else{
         		$condition[]=["a.wpay_fee","=",0];
         	}
         }
 
+       $apayIs =  isset($post['apay_is'])&&$post['apay_is']!==''?intval($post['apay_is']):'';
+        if($apayIs!==''){
+        	if($apayIs==1){
+        		$condition[]=['a.apay_fee','<>',0];
+        	}else{
+        		$condition[]=['a.apay_fee','=',0];
+        	}
+        }
+
         $pay_status =  isset($post['pay_status'])&&$post['pay_status']!==''?intval($post['pay_status']):'';
         if($pay_status!==''){
         	if($pay_status==0){
@@ -122,7 +131,13 @@ class Sale extends Base{
             $condition[]=["a.platform_type","=",$platform_type];
         }
 
-          $saler= isset($post['saler']) && $post['saler']!='' ? trim($post['saler']) :"";
+       $poCode =  isset($post['poCode'])&&$post['poCode']!==''?trim($post['poCode']):'';
+        if($poCode!==''){
+            $condition[]=["a.poCode","like","%$poCode%"];
+        }
+
+
+       $saler= isset($post['saler']) && $post['saler']!='' ? trim($post['saler']) :"";
         if($saler!='') $condition []=["a.ownerName","like","%$saler%"];
         $salerid= isset($post['salerid']) && $post['salerid']!='' ? intval($post['salerid']) :"";
         if($salerid!='') $condition []=["a.ownerid","=",$salerid];
@@ -163,15 +178,15 @@ class Sale extends Base{
                             $value['inv_tag_remark']='';
              if($value['pay_tag']==1 || $value['inv_tag']==1){
 	            $tag =Db::name("tag_log")->alias("a")->leftJoin("order_tag b","a.tag_id=b.id")->where
-	            (["code"=>$value['sequenceNo'],"a.status"=>[1,2]])->order("id desc")->column("a.id,b.tag_name,a.tag_img,a.tag_remark","b.type");
-	            if($value['pay_tag']==1){
+	            (["code"=>$value['sequenceNo'],"a.status"=>[1,2]])->order("a.id desc")->column("a.id,b.tag_name,a.tag_img,a.tag_remark","b.type");
+	            if($value['inv_tag']==1){
 		            $value['inv_tag_name']=$tag[4]['tag_name']??'';
 		            $value['inv_tag_id']=$tag[4]['id']??'0';
 		            $value['inv_tag_img']=$tag[4]['tag_img']??'';
 		            $value['inv_tag_remark']=$tag[4]['tag_remark']??'';
 	            }
 	           
-	             if($value['inv_tag']==1){
+	             if($value['pay_tag']==1){
 		            $value['pay_tag_id']=$tag[3]['id']??'0';
 		            $value['pay_tag_name']=$tag[3]['tag_name']??'';
 		            $value['pay_tag_img']=$tag[3]['tag_img']??'';
@@ -223,9 +238,9 @@ class Sale extends Base{
         if($total_max!==''){
            $condition[]=["a.totalPrice","<=",$total_max];
         }
-        $cxCode = isset($post['cxCode'])&&$post['cxCode']!==''?trim($post['cxCode']):'';
-        if($cxCode!==''){
-           $condition[]=["a.cxCode","=",$cxCode];
+         $cxCode =$post['cxCode']??[];
+        if(!empty($cxCode)){
+           $condition[]=['a.cxCode','in',$cxCode];
         }
         $inv_status =  isset($post['inv_status'])&&$post['inv_status']!==''?intval($post['inv_status']):'';
         if($inv_status!==''){
@@ -245,12 +260,20 @@ class Sale extends Base{
         }
         $payIs =  isset($post['pay_is'])&&$post['pay_is']!==''?intval($post['pay_is']):'';
         if($payIs!==''){
-        	if($invIs==1){
+        	if($payIs==1){
         		$condition[]=["a.wpay_fee","<>",0];
         	}else{
         		$condition[]=["a.wpay_fee","=",0];
         	}
         }
+        $apayIs =  isset($post['apay_is'])&&$post['apay_is']!==''?intval($post['apay_is']):'';
+        if($apayIs!==''){
+            if($apayIs==1){
+                $condition[]=['a.apay_fee','<>',0];
+            }else{
+                $condition[]=['a.apay_fee','=',0];
+            }
+        }
 
         $pay_status =  isset($post['pay_status'])&&$post['pay_status']!==''?intval($post['pay_status']):'';
         if($pay_status!==''){
@@ -344,14 +367,14 @@ class Sale extends Base{
              if($value['pay_tag']==1 || $value['inv_tag']==1){
 	            $tag =Db::name('tag_log')->alias('a')->leftJoin('order_tag b','a.tag_id=b.id')->where
 	            (['code'=>$value['sequenceNo'],'a.status'=>[1,2]])->order('id desc')->column('a.id,b.tag_name,a.tag_img,a.tag_remark','b.type');
-	            if($value['pay_tag']==1){
+	            if($value['inv_tag']==1){
 		            $value['inv_tag_name']=$tag[4]['tag_name']??'';
 		            $value['inv_tag_id']=$tag[4]['id']??'0';
 		            $value['inv_tag_img']=$tag[4]['tag_img']??'';
 		            $value['inv_tag_remark']=$tag[4]['tag_remark']??'';
 	            }
 	           
-	             if($value['inv_tag']==1){
+	             if($value['pay_tag']==1){
 		            $value['pay_tag_id']=$tag[3]['id']??'0';
 		            $value['pay_tag_name']=$tag[3]['tag_name']??'';
 		            $value['pay_tag_img']=$tag[3]['tag_img']??'';
@@ -434,14 +457,14 @@ class Sale extends Base{
         if($qrdinfo['pay_tag']==1 || $qrdinfo['inv_tag']==1){
 	        $tag =Db::name('tag_log')->alias('a')->leftJoin('order_tag b','a.tag_id=b.id')
 	        ->where(['code'=>$qrdinfo['sequenceNo'],'a.status'=>[1,2]])->order('id desc')->column('a.id,b.tag_name,a.tag_img,a.tag_remark','b.type');
-	         if($qrdinfo['pay_tag']==1){
+	         if($qrdinfo['inv_tag']==1){
 		            $qrdinfo['inv_tag_name']=$tag[4]['tag_name']??'';
 		            $qrdinfo['inv_tag_id']=$tag[4]['id']??'0';
 		            $qrdinfo['inv_tag_img']=$tag[4]['tag_img']??'';
 		            $qrdinfo['inv_tag_remark']=$tag[4]['tag_remark']??'';
 	            }
 	           
-	             if($qrdinfo['inv_tag']==1){
+	             if($qrdinfo['pay_tag']==1){
 		            $qrdinfo['pay_tag_id']=$tag[3]['id']??'0';
 		            $qrdinfo['pay_tag_name']=$tag[3]['tag_name']??'';
 		            $qrdinfo['pay_tag_img']=$tag[3]['tag_img']??'';

app/admin/listener/ComonQrd.php

@@ -57,7 +57,7 @@ class ComonQrd
             		if(!isset($payArr[$item->sequenceNo]))continue;
 		           $tag_temp=[
 		                'code'=>$item->sequenceNo,
-		                'tag_id'=>10,
+		                'tag_id'=>107,//开票申请同步QR
 		                'creater'=>'system',
 		                'createrid'=>0,
 		                'tag_fee'=>0,
@@ -119,7 +119,7 @@ class ComonQrd
     	        $tag_temp=[
     	            "id"=>null,
                     'code'=>$item->sequenceNo,
-                    'tag_id'=>10,
+                    'tag_id'=>108,//对账付款同步至QR
                     'creater'=>'system',
                     'createrid'=>0,
                     'tag_fee'=>0,