作者 lyh

未续费项目增加搜索

@@ -100,7 +100,7 @@ class TicketCount extends Command @@ -100,7 +100,7 @@ class TicketCount extends Command
100 ->where(function ($query) { 100 ->where(function ($query) {
101 $query->where(function ($q) { 101 $query->where(function ($q) {
102 $q->whereNotNull('end_at') 102 $q->whereNotNull('end_at')
103 - ->whereColumn('plan_end_at', '>', 'end_at'); 103 + ->whereColumn('plan_end_at', '<', 'end_at');
104 })->orWhere(function ($q) { 104 })->orWhere(function ($q) {
105 $q->whereNull('end_at') 105 $q->whereNull('end_at')
106 ->where('plan_end_at', '>', now()); 106 ->where('plan_end_at', '>', now());
@@ -166,7 +166,7 @@ class TicketCount extends Command @@ -166,7 +166,7 @@ class TicketCount extends Command
166 ->where(function ($query) { 166 ->where(function ($query) {
167 $query->where(function ($q) { 167 $query->where(function ($q) {
168 $q->whereNotNull('end_at') 168 $q->whereNotNull('end_at')
169 - ->whereColumn('plan_end_at', '>', 'end_at'); 169 + ->whereColumn('plan_end_at', '<', 'end_at');
170 })->orWhere(function ($q) { 170 })->orWhere(function ($q) {
171 $q->whereNull('end_at') 171 $q->whereNull('end_at')
172 ->where('plan_end_at', '>', now()); 172 ->where('plan_end_at', '>', now());
@@ -227,7 +227,7 @@ class TicketCount extends Command @@ -227,7 +227,7 @@ class TicketCount extends Command
227 ->where(function ($query) { 227 ->where(function ($query) {
228 $query->where(function ($q) { 228 $query->where(function ($q) {
229 $q->whereNotNull('end_at') 229 $q->whereNotNull('end_at')
230 - ->whereColumn('plan_end_at', '>', 'end_at'); 230 + ->whereColumn('plan_end_at', '<>>', 'end_at');
231 })->orWhere(function ($q) { 231 })->orWhere(function ($q) {
232 $q->whereNull('end_at') 232 $q->whereNull('end_at')
233 ->where('plan_end_at', '>', now()); 233 ->where('plan_end_at', '>', now());