dev

admin/control/refill_order.php

@@ -86,12 +86,16 @@ class refill_orderControl extends SystemControl
         $start_unixtime = intval(strtotime($_GET['query_start_time']));
         $end_unixtime = intval(strtotime($_GET['query_end_time']));
 
+        if($end_unixtime <= 0) {
+            $end_unixtime = time();
+        }
+
         if ($start_unixtime > 0 && $end_unixtime > $start_unixtime) {
             $condition['refill_order.order_time'] = [['egt', $start_unixtime], ['lt', $end_unixtime], 'and'];
-            $condition['vr_order.add_time'] = ['egt', $start_unixtime-1];
+            $condition['vr_order.add_time'] = [['egt', $start_unixtime],['lt', $end_unixtime], 'and'];
         } elseif ($start_unixtime > 0) {
             $condition['refill_order.order_time'] = ['egt', $start_unixtime];
-            $condition['vr_order.add_time'] = ['egt', $start_unixtime-1];
+            $condition['vr_order.add_time'] = ['egt', $start_unixtime];
         } elseif ($end_unixtime > 0) {
             $condition['refill_order.order_time'] = ['lt', $end_unixtime];
         } else {