diff --git a/CHANGELOG.md b/CHANGELOG.md index ae1935b3..23a7aba5 100644 --- a/CHANGELOG.md +++ b/CHANGELOG.md @@ -1,3 +1,7 @@ +### [v1.5.5](https://gitee.com/koogua/course-tencent-cloud/releases/v1.5.5)(2022-07-15) + +- 修正获分类查询条件 + ### [v1.5.4](https://gitee.com/koogua/course-tencent-cloud/releases/v1.5.4)(2022-06-15) - 增加migration助手SettingTrait diff --git a/app/Builders/QuestionList.php b/app/Builders/QuestionList.php index 10a40a3c..aeabd0e8 100644 --- a/app/Builders/QuestionList.php +++ b/app/Builders/QuestionList.php @@ -23,15 +23,15 @@ class QuestionList extends Builder return $questions; } - public function handleCategories(array $articles) + public function handleCategories(array $questions) { $categories = $this->getCategories(); - foreach ($articles as $key => $article) { - $articles[$key]['category'] = $categories[$article['category_id']] ?? new \stdClass(); + foreach ($questions as $key => $article) { + $questions[$key]['category'] = $categories[$article['category_id']] ?? new \stdClass(); } - return $articles; + return $questions; } public function handleUsers(array $questions) diff --git a/app/Console/Tasks/DeliverTask.php b/app/Console/Tasks/DeliverTask.php index aec87f1d..de42c7ea 100644 --- a/app/Console/Tasks/DeliverTask.php +++ b/app/Console/Tasks/DeliverTask.php @@ -58,6 +58,9 @@ class DeliverTask extends Task case OrderModel::ITEM_VIP: $this->handleVipOrder($order); break; + default: + $this->noMatchedHandler($order); + break; } $order->status = OrderModel::STATUS_FINISHED; @@ -153,6 +156,11 @@ class DeliverTask extends Task $this->closePendingOrders($user->id); } + protected function noMatchedHandler(OrderModel $order) + { + throw new \RuntimeException("No Matched Handler For Order: {$order->id}"); + } + protected function closePendingOrders($userId) { $orders = $this->findUserPendingOrders($userId); diff --git a/app/Http/Admin/Services/Question.php b/app/Http/Admin/Services/Question.php index ac514eda..71caa2b8 100644 --- a/app/Http/Admin/Services/Question.php +++ b/app/Http/Admin/Services/Question.php @@ -46,7 +46,7 @@ class Question extends Service $categoryRepo = new CategoryRepo(); return $categoryRepo->findAll([ - 'type' => CategoryModel::TYPE_ARTICLE, + 'type' => CategoryModel::TYPE_QUESTION, 'level' => 1, 'published' => 1, 'deleted' => 0,