|
@@ -266,7 +266,7 @@ class ordersendlistControl extends SystemControl
|
|
$condition['refill_order.inner_status'] = 0;
|
|
$condition['refill_order.inner_status'] = 0;
|
|
$condition['refill_order.is_retrying'] = 0;
|
|
$condition['refill_order.is_retrying'] = 0;
|
|
$condition['vr_order.order_state'] = ['in', "{$order_state_cancel},{$order_state_success}"];
|
|
$condition['vr_order.order_state'] = ['in', "{$order_state_cancel},{$order_state_success}"];
|
|
- $condition['refill_order.mch_notify_state'] = 0;
|
|
|
|
|
|
+ $condition['refill_order.mch_notify_state'] = ['in', "0,2"];
|
|
|
|
|
|
if (empty($_GET['time'])) {
|
|
if (empty($_GET['time'])) {
|
|
$_GET['time'] = 1;
|
|
$_GET['time'] = 1;
|
|
@@ -309,7 +309,7 @@ class ordersendlistControl extends SystemControl
|
|
$order_state_success = ORDER_STATE_SUCCESS;
|
|
$order_state_success = ORDER_STATE_SUCCESS;
|
|
$condition['refill_order.inner_status'] = 0;
|
|
$condition['refill_order.inner_status'] = 0;
|
|
$condition['vr_order.order_state'] = ['in', "{$order_state_cancel},{$order_state_success}"];
|
|
$condition['vr_order.order_state'] = ['in', "{$order_state_cancel},{$order_state_success}"];
|
|
- $condition['refill_order.mch_notify_state'] = 0;
|
|
|
|
|
|
+ $condition['refill_order.mch_notify_state'] = ['in', "0,2"];
|
|
|
|
|
|
$time = $_GET['time'] * 3600;
|
|
$time = $_GET['time'] * 3600;
|
|
$condition['refill_order.order_time'] = ['gt', (time() - $time)];
|
|
$condition['refill_order.order_time'] = ['gt', (time() - $time)];
|