wugg 2 years ago
parent
commit
8cd8de678e
2 changed files with 31 additions and 7 deletions
  1. 20 5
      app/admin/controller/Payment.php
  2. 11 2
      app/admin/controller/Sale.php

+ 20 - 5
app/admin/controller/Payment.php

@@ -152,12 +152,27 @@ class Payment extends BaseController
         if($payNo!=""){
              $condition[]=["payNo","like","%$payNo%"];
         }
-        if($paystatus!=""){
-             $condition[]=["pay_status","=",$paystatus];
-        }
-        if($inv_status!=""){
-            $condition[]=["inv_status","=",$inv_status];
+        if($inv_status!==''){
+        	if($inv_status==0){
+        		$condition[]=["inv_status","<>",3];
+        	}else{
+        		$condition[]=["inv_status","=",$inv_status];
+        	}
+        }
+        if($pay_status!==''){
+        	if($pay_status==0){
+        		$condition[]=["a.pay_status","<>",3];
+        	}else{
+        		$condition[]=["a.pay_status","=",$pay_status];
+        	}
+
         }
+//        if($paystatus!=""){
+//             $condition[]=["pay_status","=",$paystatus];
+//        }
+//        if($inv_status!=""){
+//            $condition[]=["inv_status","=",$inv_status];
+//        }
         if($status!=""){
             $condition[]=["status","=",$status];
         }

+ 11 - 2
app/admin/controller/Sale.php

@@ -37,11 +37,20 @@ class Sale extends BaseController{
         }
         $inv_status =  isset($post['inv_status'])&&$post['inv_status']!==''?intval($post['inv_status']):'';
         if($inv_status!==''){
-            $condition[]=["a.inv_status","=",$inv_status];
+        	if($inv_status==0){
+        		$condition[]=["a.inv_status","<>",3];
+        	}else{
+        		$condition[]=["a.inv_status","=",$inv_status];
+        	}
         }
         $pay_status =  isset($post['pay_status'])&&$post['pay_status']!==''?intval($post['pay_status']):'';
         if($pay_status!==''){
-            $condition[]=["a.pay_status","=",$pay_status];
+        	if($pay_status==0){
+        		$condition[]=["a.pay_status","<>",3];
+        	}else{
+        		$condition[]=["a.pay_status","=",$pay_status];
+        	}
+
         }
         $status =  isset($post['status'])&&$post['status']!==''?intval($post['status']):'';
         if($status!==''){