|
@@ -21,7 +21,7 @@ class ordersendlistControl extends SystemControl
|
|
|
$_GET['quality'] = 2;
|
|
|
}
|
|
|
|
|
|
- $time = time();
|
|
|
+ $time = time() - 20;
|
|
|
$condition['refill_order.order_time'] = ['exp', "refill_order.order_time < ({$time} - merchant.time_out)"];
|
|
|
// $condition['refill_order.order_time'] = ['lt',time()-300];
|
|
|
if (!empty($_GET['mchid'])) {
|
|
@@ -267,6 +267,7 @@ class ordersendlistControl extends SystemControl
|
|
|
$condition['refill_order.is_retrying'] = 0;
|
|
|
$condition['vr_order.order_state'] = ['in', "{$order_state_cancel},{$order_state_success}"];
|
|
|
$condition['refill_order.mch_notify_state'] = ['in', "0,2"];
|
|
|
+ $condition['refill_order.mch_notify_times'] = ['gt', 0];
|
|
|
|
|
|
if (empty($_GET['time'])) {
|
|
|
$_GET['time'] = 1;
|