From 00add4ec0c4037ba81e6de8434635a20a599f199 Mon Sep 17 00:00:00 2001 From: liapples Date: Fri, 3 Sep 2021 15:18:28 +0800 Subject: [PATCH] =?UTF-8?q?=E5=A2=9E=E5=8A=A0=E7=BA=BF=E4=B8=8B=E6=9C=AA?= =?UTF-8?q?=E4=BB=98=E6=AC=BE=E5=A4=84=E7=90=86?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- app/Console/Commands/OrderTimeout.php | 2 +- app/Http/Controllers/Api/OrderController.php | 2 +- 2 files changed, 2 insertions(+), 2 deletions(-) diff --git a/app/Console/Commands/OrderTimeout.php b/app/Console/Commands/OrderTimeout.php index 9601d8b..4cfa82f 100644 --- a/app/Console/Commands/OrderTimeout.php +++ b/app/Console/Commands/OrderTimeout.php @@ -42,7 +42,7 @@ class OrderTimeout extends Command public function handle() { //需要处理的订单状态 - $status_arr = [OrderStatus::UNPAID, OrderStatus::PAY_EARNEST]; + $status_arr = [OrderStatus::UNPAID, OrderStatus::PAY_EARNEST, OrderStatus::OFFLINE_UNPAID]; //记录最小ID，下次查询时按ID正序查询，只处理大于该ID的订单，避免重复扫描数据库 $min_id = Order::query()->whereIn('status', $status_arr)->min('id'); diff --git a/app/Http/Controllers/Api/OrderController.php b/app/Http/Controllers/Api/OrderController.php index 7214ef3..1f30635 100644 --- a/app/Http/Controllers/Api/OrderController.php +++ b/app/Http/Controllers/Api/OrderController.php @@ -80,7 +80,7 @@ class OrderController extends Controller if ($v['timeout'] !== null) { $second = strtotime($v['timeout']) - $time; - if ($second > 0 && $v['status'] == Status::UNPAID) { + if ($second > 0) { $v['status_text'] = '请在' . ceil($second / 60) . '分钟内付款'; } else if ($second < 0 && $v['status'] == Status::PAY_EARNEST) { $v['status_text'] = '尾款支付已超时';