diff --git a/admin/libraries/Ordersv2List.php b/admin/libraries/Ordersv2List.php index c5b57d71..38e2bc53 100644 --- a/admin/libraries/Ordersv2List.php +++ b/admin/libraries/Ordersv2List.php @@ -137,6 +137,16 @@ class Ordersv2List $where["{$this->t1}.bill_time <="] = $bill_time[1] . ' 23:59:59'; } } + //交付时间 + if ($params['over_time']) { + $over_time = explode(' ~ ', $params['over_time']); + if ($over_time[0]) { + $where["{$this->t1}.over_time >="] = $over_time[0] . ' 00:00:00'; + } + if ($over_time[1]) { + $where["{$this->t1}.over_time <="] = $over_time[1] . ' 23:59:59'; + } + } if(strlen($params['is_bill'])){ if($params['is_bill']){ $where["{$this->t1}.bill_time <> '0000-00-00 00:00:00'"] = null; @@ -239,7 +249,7 @@ class Ordersv2List }elseif($params['status_pid'] == 21){ //退款时间排序 $orderby = "{$this->t1}.refund_time desc"; } else { - $orderby = "{$this->t1}.c_time desc"; + $orderby = strlen($params['status_pid']) ? "{$this->t1}.over_time desc,{$this->t1}.c_time desc" : "{$this->t1}.c_time desc"; } if (strlen($params['status_pid']) && $params['status'] && $params['status_pid']!=21 &&$params['status']<21) { $where["{$this->t2}.pid_status"] = $params['status_pid']; @@ -499,7 +509,7 @@ class Ordersv2List order_time,bill_time,item_id,over_time"; $count = $this->ci->mdOrders->count($where); - $rows = $this->ci->mdOrders->select($where, 'c_time desc', $page, $size, $fileds); + $rows = $this->ci->mdOrders->select($where, 'over_time desc,c_time desc', $page, $size, $fileds); $lists = []; if ($count) { //客户来源 diff --git a/admin/views/receiver/orderv2/lists.php b/admin/views/receiver/orderv2/lists.php index 213fe571..99d8bfcd 100644 --- a/admin/views/receiver/orderv2/lists.php +++ b/admin/views/receiver/orderv2/lists.php @@ -225,6 +225,16 @@ + }else{?> +