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

定时发布功能



查看合并请求 !741

@@ -99,7 +99,7 @@ class SendProduct extends Command
         $start_date = date('Y-m-d H:i:s');
         $end_date = date('Y-m-d 23:59:59');
         $blogModel = new Blog();
-        $arr = $blogModel->formatQuery(['send_time'=>['between',[$start_date,$end_date]],'status'=>3])->pluck('url');
+        $arr = $blogModel->formatQuery(['release_at'=>['between',[$start_date,$end_date]],'status'=>3])->pluck('url');
         $blogModel->edit(['status'=>1],['release_at'=>['between',[$start_date,$end_date]],'status'=>3]);
         return $arr;
     }
@@ -115,7 +115,7 @@ class SendProduct extends Command
         $start_date = date('Y-m-d H:i:s');
         $end_date = date('Y-m-d 23:59:59');
         $newsModel = new News();
-        $arr = $newsModel->formatQuery(['send_time'=>['between',[$start_date,$end_date]],'status'=>3])->pluck('url');
+        $arr = $newsModel->formatQuery(['release_at'=>['between',[$start_date,$end_date]],'status'=>3])->pluck('url');
         $newsModel->edit(['status'=>1],['release_at'=>['between',[$start_date,$end_date]],'status'=>3]);
         return $arr;
     }

@@ -73,7 +73,11 @@ class BlogController extends BaseController
             $query = $query->where('operator_id',$this->map['operator_id']);
         }
         if(isset($this->map['status'])){
-            $query = $query->where('status',$this->map['status']);
+            if($this->map['status'] == 0){
+                $query = $query->whereIn('status',[0,3]);
+            }else{
+                $query = $query->where('status',$this->map['status']);
+            }
         }
         if(isset($this->map['name']) && !empty($this->map['name'])){
             $query = $query->where('name',$this->map['name'][0],'%'.$this->map['name'][1].'%');

@@ -77,7 +77,11 @@ class NewsController extends BaseController
             $query = $query->where('operator_id',$this->map['operator_id']);
         }
         if(isset($this->map['status'])){
-            $query = $query->where('status',$this->map['status']);
+            if($this->map['status'] == 0){
+                $query = $query->whereIn('status',[0,3]);
+            }else{
+                $query = $query->where('status',$this->map['status']);
+            }
         }
         if(isset($this->map['name']) && !empty($this->map['name'])){
             $query = $query->where('name',$this->map['name'][0],'%'.$this->map['name'][1].'%');

@@ -84,13 +84,14 @@ class Product extends Base
     const STATUS_DRAFT = 0;
     const STATUS_ON = 1;
     const STATUS_RECYCLE = 2;
-
+    const STATUS_THREE = 3;
 
     public static function statusMap(){
         return [
             self::STATUS_DRAFT    => '草稿',
             self::STATUS_ON   => '已发布',
             self::STATUS_RECYCLE  => '回收站',
+            self::STATUS_THREE  => '待发布',
         ];
     }