|
@@ -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];
|
|
|
}
|