|
|
@@ -217,12 +217,13 @@ class ordersendlistControl extends SystemControl
|
|
|
//耗时
|
|
|
$fields = "refill_order.*,vr_order.order_state";
|
|
|
$order_by = "({$cur_time} - refill_order.commit_time) desc";
|
|
|
- $order_list = $model_refill_order->getMerchantTimeOut($orders_cond, 200, 10000,$fields, $order_by);
|
|
|
$order_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($orders_cond)->find();
|
|
|
+ $order_list = $model_refill_order->getMerchantTimeOut($orders_cond, 200, $order_stat['order_count'],$fields, $order_by);
|
|
|
+
|
|
|
|
|
|
$special_stat = $this->extra_stats($base_cond, $timeout_type,$cur_time);
|
|
|
$merchant_list = $this->merchants();
|
