|
@@ -49,9 +49,13 @@ class order_searchControl extends SystemControl
|
|
|
|
|
|
if(!empty($condition)) {
|
|
|
$condition['refill_order.inner_status'] = 0;
|
|
|
+ $cur_time = time();
|
|
|
|
|
|
$start_unixtime = intval(strtotime($_GET['query_start_time']));
|
|
|
$end_unixtime = intval(strtotime($_GET['query_end_time']));
|
|
|
+ if(!empty($_GET['time'])) {
|
|
|
+ $end_unixtime = $cur_time + $_GET['time'];
|
|
|
+ }
|
|
|
|
|
|
if ($start_unixtime > 0 && $end_unixtime > $start_unixtime) {
|
|
|
$condition['refill_order.order_time'] = [['egt', $start_unixtime], ['lt', $end_unixtime], 'and'];
|
|
@@ -75,7 +79,7 @@ class order_searchControl extends SystemControl
|
|
|
if ($order_info['notify_time'] > 0) {
|
|
|
$diff_time = $order_info['notify_time'] - $order_info['order_time'];
|
|
|
} else {
|
|
|
- $diff_time = time() - $order_info['order_time'];
|
|
|
+ $diff_time = $cur_time - $order_info['order_time'];
|
|
|
}
|
|
|
$order_list[$order_id]['diff_time_text'] = $this->elapse_time($diff_time);
|
|
|
$order_list[$order_id]['diff_time'] = $diff_time;
|