Wesmiler OTC 提交更新 0729

app/Http/Controllers/Api/AdvertController.php

@@ -21,7 +21,9 @@ class AdvertController extends webApp
     public function index()
     {
         $pageSize = request()->post('pageSize', 15);
-        $list = AdvertService::make()->getDataList(request()->all(), $pageSize);
+        $params = request()->all();
+        $params['status'] = 1;
+        $list = AdvertService::make()->getDataList($params, $pageSize);
         return message(1010, true,  $list);
     }
 

app/Services/Api/AdvertService.php

@@ -60,10 +60,22 @@ class AdvertService extends BaseService
      */
     public function getDataList($params, $pageSize = 15)
     {
-        $where = ['a.mark' => 1, 'a.status' => 1];
+        $where = ['a.mark' => 1];
         $type = isset($params['type'])? $params['type'] : 1;
+        $status = isset($params['status'])? $params['status'] : 0;
+        $advertType = isset($params['advert_type'])? $params['advert_type'] : 0;
+        $userId = isset($params['user_id'])? $params['user_id'] : 1;
         if($type>0){
-            $where['type'] = $type;
+            $where['a.type'] = $type;
+        }
+        if($status>0){
+            $where['a.status'] = $status;
+        }
+        if($advertType>0){
+            $where['a.type'] = $advertType;
+        }
+        if($userId>0){
+            $where['a.user_id'] = $userId;
         }
         $list = $this->model->from('advert as a')
             ->leftJoin('member as m', 'm.id', '=', 'a.user_id')