From 3b1d7d65662e8a91254ba295c538f76417066ba3 Mon Sep 17 00:00:00 2001
From: youda <youda@Server>
Date: Sun, 18 May 2025 13:38:58 +0800
Subject: [PATCH] 111

---
 app/admin/controller/Order.php | 9 ++++-----
 1 file changed, 4 insertions(+), 5 deletions(-)

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')