Bläddra i källkod

Logic Consistency Revisions

BrettonYe 11 månader sedan
förälder
incheckning
94f1337b5f
2 ändrade filer med 3 tillägg och 3 borttagningar
  1. 2 2
      app/Http/Controllers/UserController.php
  2. 1 1
      app/Services/OrderService.php

+ 2 - 2
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', [

+ 1 - 1
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,