diff --git a/app/admin/controller/Order.php b/app/admin/controller/Order.php index f0d3087..df2e931 100755 --- a/app/admin/controller/Order.php +++ b/app/admin/controller/Order.php @@ -1281,14 +1281,13 @@ class Order extends Base if ($u_status !== '') { $where[] = ['u.status', '=', $u_status]; } - - if ($start_time && $end_time) { - $where[] = ['o.addtime', 'between', [$start_time, $end_time]]; - } else if ($start_time) { + if ($start_time) { $where[] = ['o.addtime', '>=', $start_time]; - } else if ($end_time) { + } + if ($end_time) { $where[] = ['o.addtime', '<=', $end_time]; } + $query = Db::table('order') ->alias('o')