dev

admin/control/ordersendlist.php

@@ -261,24 +261,15 @@ class ordersendlistControl extends SystemControl
             $base_cond['refill_order.order_time'] = ['egt', $start];
         }
 
+        $cur_time = time();
         $order_list = 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('refill_order.*,vr_order.order_state,( {$cur_time} - refill_order.order_time - merchant.time_out ) as mtime_out')
+            ->field("refill_order.*,vr_order.order_state,({$cur_time} - refill_order.order_time - merchant.time_out) as mtime_out")
             ->where($base_cond)
             ->select();
 
 
-//        [$merchant_stat, $order_stat] = $this->merchant_timeout_stats($base_cond);
-
-//        if (empty($_GET['mchid'])) {
-//            $order_count = $order_stat['order_count'];
-//        }else{
-//            $order_count = $merchant_stat[$_GET['mchid']]['order_count'];
-//        }
-
-//        $fields = "refill_order.*,vr_order.order_state,( {$cur_time} - refill_order.order_time - merchant.time_out ) as mtime_out";
-//        $order_by = "mtime_out desc";
 
         $merchant_list = $merchants_getter($all_mchids);