|
@@ -344,8 +344,10 @@ class refill_orderControl extends SystemControl
|
|
|
|
|
|
foreach ($order_list as $order_id => $order_info) {
|
|
|
$order_list[$order_id]['order_state_text'] = orderState($order_info);
|
|
|
+ $order_list[$order_id]['notify_time_text'] = '/';
|
|
|
if ($order_info['notify_time'] > 0) {
|
|
|
$diff_time = $order_info['notify_time'] - $order_info['commit_time'];
|
|
|
+ $order_list[$order_id]['notify_time_text'] = date("Y-m-d H:i:s", $order_info['notify_time']);
|
|
|
} else {
|
|
|
$diff_time = time() - $order_info['order_time'];
|
|
|
if($order_info['order_state'] != ORDER_STATE_SEND) {
|
|
@@ -353,7 +355,6 @@ class refill_orderControl extends SystemControl
|
|
|
}
|
|
|
}
|
|
|
$order_list[$order_id]['commit_time_text'] = date("Y-m-d H:i:s", $order_info['commit_time']);
|
|
|
- $order_list[$order_id]['notify_time_text'] = date("Y-m-d H:i:s", $order_info['notify_time']);
|
|
|
$order_list[$order_id]['diff_time_text'] = $this->elapse_time($diff_time);
|
|
|
$order_list[$order_id]['diff_time'] = $diff_time;
|
|
|
}
|