diff --git a/service/app/admin/controller/OrderController.php b/service/app/admin/controller/OrderController.php index ed46ce1e..acc5e2cb 100644 --- a/service/app/admin/controller/OrderController.php +++ b/service/app/admin/controller/OrderController.php @@ -224,7 +224,7 @@ class OrderController extends base if(empty($item)) return $this->error(2006, '订单不存在'); if($item->admin_id != $request->admin->id) return $this->error(2007, '订单已经发生转移'); - if(!empty($travel_date) && empty($travel_end)) return $this->error(2008, '核销的订单请填写出行和返回时间'); + //if(!empty($travel_date) && empty($travel_end)) return $this->error(2008, '核销的订单请填写出行和返回时间'); Follows::create([ 'admin_id' => $request->admin->id, diff --git a/service/app/server/Douyin.php b/service/app/server/Douyin.php index bcbcd65f..5caa503f 100644 --- a/service/app/server/Douyin.php +++ b/service/app/server/Douyin.php @@ -248,9 +248,9 @@ class Douyin public function _getRetriesLock(): bool { - /*$pattern = 'php webman spider:mt'; + $pattern = 'php webman spider:'; $maxProcesses = 24; - $this->_killMiddleProcesses($pattern, $maxProcesses);*/ + $this->_killMiddleProcesses($pattern, $maxProcesses); $maxRetries = 20;