diff --git a/app/controller/CustomerController.php b/app/controller/CustomerController.php index 0f1e638..446e1fa 100644 --- a/app/controller/CustomerController.php +++ b/app/controller/CustomerController.php @@ -186,7 +186,7 @@ class CustomerController } $recycle = Util::getParam($request,'recycle', ''); - if ($recycle == 'recycle') { + if ($recycle == 'recycle' || $seas == 'seas') { $query->onlyTrashed(); } @@ -194,6 +194,9 @@ class CustomerController foreach ($data->items() as &$value) { $value = Customer::getCustomer($value, $request); + if($seas == 'seas'){ + $value['seas_time'] = time()-strtotime($value['deleted_at']); + } } return Util::page($data); diff --git a/app/process/Task.php b/app/process/Task.php index 3248a90..97ae0fe 100644 --- a/app/process/Task.php +++ b/app/process/Task.php @@ -84,7 +84,7 @@ class Task ]; $customer = Customer::where($where)->onlyTrashed()->get(); foreach ($customer as $item) { - $item->update(['user_id' => 0]); + $item->update(['user_id' => 0, 'deleted_at' => time()]); CustomerHis::create([ 'customer_id' => $item->_id, 'user_his' => $item->user_id, @@ -92,7 +92,7 @@ class Task ]); } - Log::info('send high seas start',[time()]); + Log::info('send high seas end',[time()]); }); }