|
@@ -67,14 +67,14 @@ class handler
|
|
|
$cond['refill_order.order_time'] = [['egt', $start], ['lt', $end], 'and'];
|
|
|
|
|
|
[$start, $end] = $time_scope['add_time'];
|
|
|
- $cond['vr_order.add_time'] = [['egt', $start], ['lt', $end], 'and'];
|
|
|
+ $cond['vr_order.add_time'] = [['egt', $start], ['elt', $end], 'and'];
|
|
|
|
|
|
$cond['refill_order.notify_time'] = [['egt', $cur_start], ['lt', $cur_end], 'and'];
|
|
|
} else {
|
|
|
$cond['refill_order.order_time'] = [['egt', $cur_start], ['lt', $cur_end], 'and'];
|
|
|
|
|
|
[$start, $end] = $time_scope['add_time'];
|
|
|
- $cond['vr_order.add_time'] = [['egt', $start], ['lt', $end], 'and'];
|
|
|
+ $cond['vr_order.add_time'] = [['egt', $start], ['elt', $end], 'and'];
|
|
|
}
|
|
|
|
|
|
return $cond;
|