admin update

admin/control/ordersendlist.php

@@ -17,9 +17,9 @@ class ordersendlistControl extends SystemControl
         $condition['refill_order.inner_status'] = 0;
         $condition['vr_order.order_state'] = ORDER_STATE_SEND;
 
-        $time = time();
-        $condition['refill_order.order_time'] = ['exp', "refill_order.order_time < ({$time} - merchant.time_out)"];
-//        $condition['refill_order.order_time'] = ['lt',time()-300];
+//        $time = time();
+//        $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'])) {
             $condition['refill_order.mchid'] = $_GET['mchid'];
         }
@@ -85,17 +85,17 @@ class ordersendlistControl extends SystemControl
             $condition['refill_order.quality'] = $_GET['quality'];
         }
 
-        $order_list = $model_refill_order->getMerchantTimeOut($condition, 50, 'refill_order.*,vr_order.order_state', 'refill_order.order_time asc');
-//        $order_list = $model_refill_order->getMerchantOrderList($condition, 50, 'refill_order.*,vr_order.order_state', 'refill_order.order_time asc');
+//        $order_list = $model_refill_order->getMerchantTimeOut($condition, 50, 'refill_order.*,vr_order.order_state', 'refill_order.order_time asc');
+        $order_list = $model_refill_order->getMerchantOrderList($condition, 50, 'refill_order.*,vr_order.order_state', 'refill_order.order_time asc');
 
-        $stat = Model('')->table('refill_order,vr_order,merchant')->join('inner,inner')
-            ->on('refill_order.order_id=vr_order.order_id,refill_order.mchid=merchant.mchid')
-            ->field('count(*) as order_count ,sum(refill_amount) as refill_amounts, sum(channel_amount) as channel_amounts, sum(mch_amount) as mch_amounts')
-            ->where($condition)->find();
-//        $stat = Model('')->table('refill_order,vr_order')->join('inner')
-//            ->on('refill_order.order_id=vr_order.order_id')
+//        $stat = Model('')->table('refill_order,vr_order,merchant')->join('inner,inner')
+//            ->on('refill_order.order_id=vr_order.order_id,refill_order.mchid=merchant.mchid')
 //            ->field('count(*) as order_count ,sum(refill_amount) as refill_amounts, sum(channel_amount) as channel_amounts, sum(mch_amount) as mch_amounts')
 //            ->where($condition)->find();
+        $stat = Model('')->table('refill_order,vr_order')->join('inner')
+            ->on('refill_order.order_id=vr_order.order_id')
+            ->field('count(*) as order_count ,sum(refill_amount) as refill_amounts, sum(channel_amount) as channel_amounts, sum(mch_amount) as mch_amounts')
+            ->where($condition)->find();
         $count = $this->refill_stats($condition, $time_cond);
 
         $merchant_list = Model('')->table('merchant')->limit(1000)->order('name asc')->select();