|
@@ -183,12 +183,15 @@ class ordersendlistControl extends SystemControl
|
|
|
if(empty($_GET['time'])) {
|
|
|
$_GET['time'] = 1;
|
|
|
}
|
|
|
+ if(empty($_GET['notify_time'])) {
|
|
|
+ $_GET['notify_time'] = 180;
|
|
|
+ }
|
|
|
$time = $_GET['time'] * 3600;
|
|
|
$condition['refill_order.order_time'] = ['gt', (time() - $time)];
|
|
|
- if(!empty($_GET['notify_time'])) {
|
|
|
- $notify_time = $_GET['notify_time'];
|
|
|
- $condition['refill_order.notify_time'] = ['lt', (time() - $notify_time)];
|
|
|
- }
|
|
|
+
|
|
|
+ $notify_time = $_GET['notify_time'];
|
|
|
+ $condition['refill_order.notify_time'] = ['lt', (time() - $notify_time)];
|
|
|
+
|
|
|
|
|
|
$order_list = $model_refill_order->getMerchantOrderList($condition, '', 'refill_order.*,vr_order.order_state', 'refill_order.notify_time asc', 1000);
|
|
|
$merchant_list = Model('')->table('merchant')->limit(1000)->order('name asc')->select();
|