From fc2f2dc8ee408fa6f91ab67e457b23f59bdddd96 Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?=E6=9D=8E=E9=9D=99?= Date: Wed, 19 Jan 2022 15:04:17 +0800 Subject: [PATCH] =?UTF-8?q?=E4=BC=98=E5=8C=96=E7=BB=8F=E9=94=80=E5=95=86?= =?UTF-8?q?=E8=AE=A2=E5=8D=95=E8=87=AA=E5=8A=A8=E5=88=86=E9=85=8D=E6=97=B6?= =?UTF-8?q?=E9=97=B4?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- app/Admin/Forms/Settings/Dealer.php | 2 +- app/Console/Commands/Dealer/OrderAutoAllocate.php | 2 +- 2 files changed, 2 insertions(+), 2 deletions(-) diff --git a/app/Admin/Forms/Settings/Dealer.php b/app/Admin/Forms/Settings/Dealer.php index e56a7b3a..6e8aa462 100644 --- a/app/Admin/Forms/Settings/Dealer.php +++ b/app/Admin/Forms/Settings/Dealer.php @@ -43,7 +43,7 @@ class Dealer extends Form $this->currency('upgrade_amount_'.DealerLvl::Special->value, '特邀门槛')->symbol('￥'); $this->currency('upgrade_amount_'.DealerLvl::Gold->value, '金牌门槛')->symbol('￥'); - $this->number('order_auto_allocate_times', '订单自动分配时间（小时）')->min(1); + $this->number('order_auto_allocate_times', '订单自动分配时间（分）')->min(1); $this->divider('签约->签约->签约'); $this->currency('channel_rules.'.DealerLvl::Contracted->value.'_'.DealerLvl::Contracted->value.'.'.DealerLvl::Contracted->value.'_0', '签约0')->symbol('￥'); diff --git a/app/Console/Commands/Dealer/OrderAutoAllocate.php b/app/Console/Commands/Dealer/OrderAutoAllocate.php index b23603f1..50f9d11a 100644 --- a/app/Console/Commands/Dealer/OrderAutoAllocate.php +++ b/app/Console/Commands/Dealer/OrderAutoAllocate.php @@ -34,7 +34,7 @@ class OrderAutoAllocate extends Command { DealerOrder::where('status', DealerOrderStatus::Pending) ->where('consignor_id', '>', 1)//到1用户或者公司的订单不需要再分配 - ->where('allocated_at', '<', now()->subHours(app_settings('dealer.order_auto_allocate_times'))) + ->where('allocated_at', '<', now()->subMinutes(app_settings('dealer.order_auto_allocate_times'))) ->chunkById(200, function ($orders) { $orders->load([ 'consignor',