|
@@ -94,8 +94,10 @@ class refill_orderControl extends SystemControl
|
|
|
$fToday = true;
|
|
|
}
|
|
|
|
|
|
- if (in_array($_GET['order_state'], ['0', '10', '20', '30', '40'])) {
|
|
|
+ if (in_array($_GET['order_state'], ['0', '10', '20', '30', '40']))
|
|
|
+ {
|
|
|
$condition['vr_order.order_state'] = $_GET['order_state'];
|
|
|
+
|
|
|
if ($_GET['order_state'] == ORDER_STATE_SEND) {
|
|
|
if ($_GET['time'] == 1) {
|
|
|
$condition['refill_order.order_time'] = ['between', [(time() - 3600), (time() - 1800)]];
|