合并分支 'lyh-server' 到 'master'

未续费项目增加搜索



查看合并请求 !2669

@@ -103,7 +103,7 @@ class TicketCount extends Command
                             ->whereColumn('plan_end_at', '<', 'end_at');
                     })->orWhere(function ($q) {
                         $q->whereNull('end_at')
-                            ->where('plan_end_at', '>', now());
+                            ->where('plan_end_at', '<', now());
                     });
                 })
                 ->count();
@@ -169,7 +169,7 @@ class TicketCount extends Command
                             ->whereColumn('plan_end_at', '<', 'end_at');
                     })->orWhere(function ($q) {
                         $q->whereNull('end_at')
-                            ->where('plan_end_at', '>', now());
+                            ->where('plan_end_at', '<', now());
                     });
                 })
                 ->count();
@@ -227,10 +227,10 @@ class TicketCount extends Command
             ->where(function ($query) {
                 $query->where(function ($q) {
                     $q->whereNotNull('end_at')
-                        ->whereColumn('plan_end_at', '<>>', 'end_at');
+                        ->whereColumn('plan_end_at', '<', 'end_at');
                 })->orWhere(function ($q) {
                     $q->whereNull('end_at')
-                        ->where('plan_end_at', '>', now());
+                        ->where('plan_end_at', '<', now());
                 });
             })
             ->count();