|
@@ -853,6 +853,8 @@ class merchantControl extends SystemControl
|
|
|
}
|
|
|
}
|
|
|
|
|
|
+ $fToday = false;
|
|
|
+
|
|
|
if(!$fSingle)
|
|
|
{
|
|
|
$start_unixtime = intval(strtotime($_GET['query_start_time']));
|
|
@@ -870,6 +872,7 @@ class merchantControl extends SystemControl
|
|
|
else {
|
|
|
$start = strtotime(date('Y-m-d',time()));
|
|
|
$condition['refill_order.order_time'] = ['egt', $start];
|
|
|
+ $fToday = true;
|
|
|
}
|
|
|
|
|
|
if (in_array($_GET['order_state'], ['0', '10', '20', '30', '40']))
|
|
@@ -899,12 +902,9 @@ class merchantControl extends SystemControl
|
|
|
{
|
|
|
$order_list[$order_id]['card_type_text'] = $this->scard_type($order_info['card_type']);
|
|
|
$order_list[$order_id]['mch_name'] = $merchants[$order_info['mchid']]['company_name'];
|
|
|
- if($order_info['notify_time'] > 0)
|
|
|
- {
|
|
|
+ if ($order_info['notify_time'] > 0) {
|
|
|
$diff_time = $order_info['notify_time'] - $order_info['order_time'];
|
|
|
- }
|
|
|
- else
|
|
|
- {
|
|
|
+ } else {
|
|
|
$diff_time = time() - $order_info['order_time'];
|
|
|
}
|
|
|
$order_list[$order_id]['diff_time_text'] = $this->elapse_time($diff_time);
|
|
@@ -919,6 +919,7 @@ class merchantControl extends SystemControl
|
|
|
->select();
|
|
|
|
|
|
Tpl::output('stat', $stat);
|
|
|
+ Tpl::output('ftoday', $fToday);
|
|
|
Tpl::output('order_list', $order_list);
|
|
|
Tpl::output('provider_list', $provider_list);
|
|
|
Tpl::output('merchant_list', $merchant_list);
|