diff --git a/app/Crontab/AutoCancelOrder.php b/app/Crontab/AutoCancelOrder.php index 78baea5..7f4cc9d 100644 --- a/app/Crontab/AutoCancelOrder.php +++ b/app/Crontab/AutoCancelOrder.php @@ -6,9 +6,9 @@ use App\Service\v3\Interfaces\OrderOnlineServiceInterface; use Hyperf\Crontab\Annotation\Crontab; use Hyperf\Di\Annotation\Inject; -// /** -// * @Crontab(name="autocancelorder", rule="*\/1 * * * *", callback="execute", memo="自定取消15分钟过期订单") -// */ +/** + * @Crontab(name="autocancelorder", rule="*\/10 * * * * *", callback="execute", memo="自定取消15分钟过期订单") + */ class AutoCancelOrder { /** diff --git a/app/Libs/SimpleSSDB.php b/app/Libs/SimpleSSDB.php index c829bda..e8f6907 100644 --- a/app/Libs/SimpleSSDB.php +++ b/app/Libs/SimpleSSDB.php @@ -26,7 +26,7 @@ class SSDBTimeoutException extends SSDBException */ class SimpleSSDB extends SSDB { - function __construct($host, $port, $timeout_ms=2000){ + function __construct($host, $port, $timeout_ms=10000){ parent::__construct($host, $port, $timeout_ms); $this->easy(); } diff --git a/app/Service/v3/Implementations/OrderOnlineService.php b/app/Service/v3/Implementations/OrderOnlineService.php index 2679efb..fbdebf9 100644 --- a/app/Service/v3/Implementations/OrderOnlineService.php +++ b/app/Service/v3/Implementations/OrderOnlineService.php @@ -683,8 +683,9 @@ class OrderOnlineService implements OrderOnlineServiceInterface try { $orderMains = OrderMain::query() - ->where(['state' => OrderState::UNPAID]) - ->where('created_at', '<', time()-900) + ->where(['state' => OrderState::UNPAID, 'type' => OrderType::ONLINE]) + ->where('created_at', '<', time()-600) + ->orderBy('created_at', 'asc') ->limit(100) ->get(); diff --git a/app/TaskWorker/SSDBTask.php b/app/TaskWorker/SSDBTask.php index 3b949b5..38ed78c 100644 --- a/app/TaskWorker/SSDBTask.php +++ b/app/TaskWorker/SSDBTask.php @@ -13,7 +13,9 @@ class SSDBTask */ public $ss = null; - + /** + * @Task + */ public function exec($method,...$args) { $result = $this->client()->__call($method,$args);