商城活动：弱化预热时间 这个字段的操作

addons/shopro/library/activity/getter/Db.php

@@ -39,9 +39,9 @@ class Db extends Base
         $activities = $this->model->where('type', 'in', $activityTypes);
 
         if ($range_type == 'overlap') {
-            $activities = $activities->where('prehead_time', '<=', $range[1])->where('end_time', '>=', $range[0]);
+            $activities = $activities->where('start_time', '<=', $range[1])->where('end_time', '>=', $range[0]);
         } elseif ($range_type == 'contain') {
-            $activities = $activities->where('prehead_time', '>=', $range[0])->where('end_time', '<=', $range[1]);
+            $activities = $activities->where('start_time', '>=', $range[0])->where('end_time', '<=', $range[1]);
         }
 
         $activities = $activities->select();

addons/shopro/library/activity/getter/Redis.php

@@ -35,7 +35,7 @@ class Redis extends Base
 
         $newActivities = [];
         foreach ($activities as $key => $activity) {
-            if ($this->rangeCompare($range, [$activity['prehead_time'], $activity['end_time']], $range_type)) {
+            if ($this->rangeCompare($range, [$activity['start_time'], $activity['end_time']], $range_type)) {
                 $newActivities[] = $activity;
             }
         }

application/admin/model/shopro/activity/Activity.php

@@ -160,14 +160,14 @@ class Activity extends Common
                         case 'nostart':
                             $query->where('start_time', '>', time());
                             break;
-                        case 'prehead':
+                        /*case 'prehead':
                             $query->where('prehead_time', '<=', time())->where('start_time', '>', time());
-                            break;
+                            break;*/
                         case 'ing':
                             $query->where('start_time', '<=', time())->where('end_time', '>=', time());
                             break;
                         case 'show':
-                            $query->where('prehead_time', '<=', time())->where('end_time', '>=', time());
+                            $query->where('start_time', '<=', time())->where('end_time', '>=', time());
                             break;
                         case 'ended':
                             $query->where('end_time', '<', time());
@@ -199,10 +199,10 @@ class Activity extends Common
      * @param think\query\Query $query
      * @return void
      */
-    public function scopePrehead($query)
+    /*public function scopePrehead($query)
     {
         return $query->where('prehead_time', '<=', time())->where('start_time', '>', time());
-    }
+    }*/
 
     /**
      * 进行中的活动
@@ -223,7 +223,7 @@ class Activity extends Common
      */
     public function scopeShow($query)
     {
-        return $query->where('prehead_time', '<=', time())->where('end_time', '>=', time());
+        return $query->where('start_time', '<=', time())->where('end_time', '>=', time());
     }
 
     /**