admin update

admin/control/merchant.php

@@ -1385,7 +1385,7 @@ class merchantControl extends SystemControl
         $condition['refill_order.inner_status'] = 0;
         $condition['vr_order.order_state'] = ORDER_STATE_SEND;
 
-        $condition['refill_order.order_time'] = ['lt', (time() - 180)];
+        $condition['refill_order.order_time'] = ['lt', (time() - 1800)];
         $merchant_list = Model('')->table('merchant')->limit(1000)->select();
         foreach ($merchant_list as $key =>$value) {
             $merchants[$value['mchid']] = $value;