|
|
@@ -310,11 +310,18 @@ class ordersendlistControl extends SystemControl
|
|
|
if (empty($_GET['notify_time'])) {
|
|
|
$_GET['notify_time'] = 180;
|
|
|
}
|
|
|
+ $cur_time = time();
|
|
|
$time = $_GET['time'] * 3600;
|
|
|
- $condition['refill_order.order_time'] = ['gt', (time() - $time)];
|
|
|
+ $condition['refill_order.order_time'] = [['gt', ($cur_time - $time)], ['lt', $cur_time], 'and'];
|
|
|
+ $condition['vr_order.add_time'] = [['gt', ($cur_time - $time)], ['lt', $cur_time], 'and'];
|
|
|
|
|
|
$notify_time = $_GET['notify_time'];
|
|
|
- $condition['refill_order.notify_time'] = ['lt', (time() - $notify_time)];
|
|
|
+ if($notify_time > 0) {
|
|
|
+ $start_day = strtotime("-5 days",$cur_time);
|
|
|
+ $condition['refill_order.notify_time'] = ['lt', (time() - $notify_time)];
|
|
|
+ $condition['refill_order.notify_time'] = [['gt', $start_day], ['lt', ($cur_time - $notify_time)], 'and'];
|
|
|
+ }
|
|
|
+
|
|
|
|
|
|
|
|
|
$order_list = $model_refill_order->getMerchantOrderList($condition, '', 'refill_order.*,vr_order.order_state', 'refill_order.notify_time asc', 1000);
|
