|
@@ -312,14 +312,16 @@ class ordersendlistControl extends SystemControl
|
|
|
}
|
|
|
else
|
|
|
{
|
|
|
- $order_by = 'refill_order.order_time desc';
|
|
|
- $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")
|
|
|
- ->where($base_cond)
|
|
|
- ->order($order_by)
|
|
|
- ->select();
|
|
|
+// $order_by = 'refill_order.order_time desc';
|
|
|
+// $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")
|
|
|
+// ->where($base_cond)
|
|
|
+// ->order($order_by)
|
|
|
+// ->select();
|
|
|
+ $order_list = $model_refill_order->getOrderMonitorTransfer($base_cond, 200, 5000,
|
|
|
+ "refill_order.*,vr_order.order_state,({$cur_time} - refill_order.order_time - merchant.time_out) as mtime_out");
|
|
|
|
|
|
$merchant_list = $merchants_getter($all_mchids);
|
|
|
if(!empty($order_list))
|