|
@@ -553,8 +553,8 @@ class RangeService extends Service
|
|
//待审核
|
|
//待审核
|
|
$args = "(sales_order_type = " . SalesOrder::Order_type_one . " and state = ". SalesOrder::State_one . ")";
|
|
$args = "(sales_order_type = " . SalesOrder::Order_type_one . " and state = ". SalesOrder::State_one . ")";
|
|
}elseif($search['is_check'] == 2){
|
|
}elseif($search['is_check'] == 2){
|
|
- //已审
|
|
|
|
- $args = "(sales_order_type = " . SalesOrder::Order_type_one . " and state = ". SalesOrder::State_two . ")";
|
|
|
|
|
|
+ //已审 线上订单的已审核是2 其它是 3 state = ". SalesOrder::State_two . "
|
|
|
|
+ $args = "(sales_order_type = " . SalesOrder::Order_type_one . " and ((model_type = " . SalesOrder::Model_type_four ." and state = " . SalesOrder::State_two.") or (model_type <> " . SalesOrder::Model_type_four ." and state = " . SalesOrder::State_three.")))";
|
|
}
|
|
}
|
|
|
|
|
|
return $args;
|
|
return $args;
|