活动显示

@@ -130,7 +130,7 @@ trait ActivityCache
                         continue;
                     }
                 } else if ($status == 'nostart') {
-                    if (time() > $starttime || $tomorrow_start < $endtime) {
+                    if (time() > $starttime || $tomorrow_start < $starttime) {
                         continue;
                     }
                 } else if ($status == 'ended') {
@@ -138,7 +138,7 @@ trait ActivityCache
                         continue;
                     }
                 } else if ($status == 'tomorrow') {
-                    if ($tomorrow_start > $starttime || $tomorrow_end < $endtime) {
+                    if ($tomorrow_start > $starttime || $tomorrow_end < $starttime) {
                         continue;
                     }
                 }

@@ -205,7 +205,7 @@ class Goods extends Model
             ];
         }else{ //下一场
             $where['starttime'] = ['>', time()];
-            $where['endtime'] = ['<', $tomorrow_start];
+            $where['starttime'] = ['<', $tomorrow_start];
             $activity = Activity::where($where)->order('starttime')->find();
             if($activity){
                 $type = 'nostart';
@@ -215,7 +215,7 @@ class Goods extends Model
                 ];
             }else{ //明日预告
                 $where['starttime'] = ['>', $tomorrow_start];
-                $where['endtime'] = ['<', $tomorrow_end];
+                $where['starttime'] = ['<', $tomorrow_end];
                 $activity = Activity::where($where)->order('starttime')->find();
                 $type = 'tomorrow';
             }
@@ -257,7 +257,7 @@ class Goods extends Model
             ];
         }else{ //下一场
             $where['starttime'] = ['>', time()];
-            $where['endtime'] = ['<', $tomorrow_start];
+            $where['starttime'] = ['<', $tomorrow_start];
             $activity = Activity::where($where)->order('starttime')->find();
             if($activity){
                 $type = 'nostart';
@@ -267,7 +267,7 @@ class Goods extends Model
                 ];
             }else{ //明日预告
                 $where['starttime'] = ['>', $tomorrow_start];
-                $where['endtime'] = ['<', $tomorrow_end];
+                $where['starttime'] = ['<', $tomorrow_end];
                 $activity = Activity::where($where)->order('starttime')->find();
                 $type = 'tomorrow';
             }
@@ -302,12 +302,12 @@ class Goods extends Model
                 $where['endtime'] = ['>', time()];
             } else if ($type == 'nostart') {
                 $where['starttime'] = ['>', time()];
-                $where['endtime'] = ['<', $tomorrow_start];
+                $where['starttime'] = ['<', $tomorrow_start];
             } else if ($type == 'ended') {
                 $where['endtime'] = ['<', time()];
             } else if ($type == 'tomorrow') {
                 $where['starttime'] = ['>', $tomorrow_start];
-                $where['endtime'] = ['<', $tomorrow_end];
+                $where['starttime'] = ['<', $tomorrow_end];
             }
 
             $activityList = Activity::where($where)->select();
@@ -348,12 +348,12 @@ class Goods extends Model
                 $where['endtime'] = ['>', time()];
             } else if ($type == 'nostart') {
                 $where['starttime'] = ['>', time()];
-                $where['endtime'] = ['<', $tomorrow_start];
+                $where['starttime'] = ['<', $tomorrow_start];
             } else if ($type == 'ended') {
                 $where['endtime'] = ['<', time()];
             } else if ($type == 'tomorrow') {
                 $where['starttime'] = ['>', $tomorrow_start];
-                $where['endtime'] = ['<', $tomorrow_end];
+                $where['starttime'] = ['<', $tomorrow_end];
             }
 
             $activityList = Activity::where($where)->select();