From 94f1337b5f1a117f99a0e712149ee616b1148771 Mon Sep 17 00:00:00 2001 From: BrettonYe Date: Sun, 27 Oct 2024 12:48:06 +0800 Subject: [PATCH] Logic Consistency Revisions --- app/Http/Controllers/UserController.php | 4 ++-- app/Services/OrderService.php | 2 +- 2 files changed, 3 insertions(+), 3 deletions(-) diff --git a/app/Http/Controllers/UserController.php b/app/Http/Controllers/UserController.php index a13c742d..c630ca80 100644 --- a/app/Http/Controllers/UserController.php +++ b/app/Http/Controllers/UserController.php @@ -216,8 +216,8 @@ class UserController extends Controller $nodes = Node::all(); } foreach ($goodsList as $goods) { - $goods->node_count = $nodes->where('level', '<=', $goods->level)->count(); - $goods->node_countries = $nodes->where('level', '<=', $goods->level)->pluck('country_code')->unique(); + $goods->node_count = $nodes->where('level', '<=', $goods->level)->where('status', 1)->count(); + $goods->node_countries = $nodes->where('level', '<=', $goods->level)->where('status', 1)->pluck('country_code')->unique(); } return view('user.services', [ diff --git a/app/Services/OrderService.php b/app/Services/OrderService.php index bdbd0f03..abb2856d 100644 --- a/app/Services/OrderService.php +++ b/app/Services/OrderService.php @@ -159,7 +159,7 @@ class OrderService { // 刷新账号有效时间 $data = ['expired_at' => $this->getFinallyExpiredTime()]; - if ($data['expired_at'] === now()->format('Y-m-d')) { + if ($data['expired_at'] < now()->format('Y-m-d')) { $data = array_merge([ 'u' => 0, 'd' => 0,