|
|
@@ -52,7 +52,7 @@ class Order
|
|
|
$order = $order? $order : 'created_at desc';
|
|
|
$field = $field? $field : 'o.id,o.user_id,o.order_sn,o.cluster_id,o.print_type,o.type,o.cluster_nums,o.status,o.cluster_status,o.created_at,u.user_nickname,u.avatar,d.name as device_name';
|
|
|
$orderConfig = config('config.order');
|
|
|
- $closeTime = isset($orderConfig['closeTime'])? intval($orderConfig['closeTime']) : 30;
|
|
|
+ $closeTime = isset($orderConfig['closeTime'])? intval($orderConfig['closeTime']) : 300;
|
|
|
$config = cmf_get_option('site_info');
|
|
|
$collageStartTime = isset($config['collage_start_time'])? trim($config['collage_start_time']) : '';
|
|
|
$collageStartTime = $collageStartTime? date('Y-m-d '.$collageStartTime.':00') : '';
|
|
|
@@ -66,7 +66,7 @@ class Order
|
|
|
->where($where)
|
|
|
->where('o.status','in', $status)
|
|
|
->where('o.cluster_status','in', [0,1])
|
|
|
- ->where('o.created_at','egt', date('Y-m-d H:i:s',time() - $closeTime*60))
|
|
|
+// ->where('o.created_at','egt', date('Y-m-d H:i:s',time() - $closeTime*60))
|
|
|
->where(function($query) use($params){
|
|
|
$limitClusterUser = config('print.limitClusterUser');
|
|
|
$uid = isset($params['uid'])? intval($params['uid']) : 0;
|
