Merge branch 'feature/explore' into 'master'

api/controllers/ExploreController.php

@@ -14,23 +14,32 @@ class ExploreController extends BaseController
     {
         $header = Yii::$app->request->headers;
         $platform_id = $header['FZM-PLATFORM-ID'] ?? null;
+        $data = null;
 
         if (false == $platform_id) {
             $msg = '参数错误';
             $code = -1;
-            $data = null;
             goto doEnd;
         }
 
-        $app_category_model = ExploreAppCategory::find()->where(['platform_id' => $platform_id, 'status' => ExploreAppCategory::STATUS_ON])->all();
-        foreach ($app_category_model as &$val) {
+        $app_category_model = ExploreAppCategory::find()->where(['platform_id' => $platform_id, 'status' => ExploreAppCategory::STATUS_ON])->orderBy('sort')->all();
+        if (false == $app_category_model) {
+            $msg = 'success';
+            $code = 0;
+            goto doEnd;
+        }
+        foreach ($app_category_model as $key => $val) {
             unset($val->apps);
             $val->name = $val->name[$this->lang];
             $apps_model = ExploreApp::find()->select('id, name, icon, type, app_url, slogan')
-                ->where(['app_category_id' => (int)$val->id])
+                ->where(['app_category_id' => (int)$val->id, 'status' => ExploreApp::STATUS_ON])
                 ->orderBy('sort')
                 ->limit($val->limit)
                 ->all();
+            if (empty($apps_model)) {
+                unset($app_category_model[$key]);
+                continue;
+            }
             foreach ($apps_model as &$app) {
                 $app->name = $app->name[$this->lang];
             }
@@ -39,7 +48,9 @@ class ExploreController extends BaseController
             unset($val->limit);
             unset($val->platform_id);
         }
-        $data = $app_category_model;
+        foreach ($app_category_model as $val) {
+            $data[] = $val;
+        }
         $msg = 'success';
         $code = 0;
         doEnd :
@@ -60,6 +71,12 @@ class ExploreController extends BaseController
         }
 
         $app_category_model = ExploreAppCategory::find()->where(['id' => (int)$category_id, 'platform_id' => $platform_id])->all();
+        if (false == $app_category_model) {
+            $msg = 'success';
+            $code = 0;
+            $data = null;
+            goto doEnd;
+        }
         foreach ($app_category_model as &$val) {
             foreach ($val->applications as $app) {
                 $app->name = $app->name[$this->lang];
@@ -95,10 +112,17 @@ class ExploreController extends BaseController
         $id_arr = explode(',', $ids);
         $order = "FIELD(`id`,$ids)";
         $apps_model = ExploreApp::find()->select('id, name, icon, type, app_url, slogan')
-            ->where(['in', 'id', $id_arr])
+            ->where(['status' => ExploreApp::STATUS_ON])
+            ->andWhere(['in', 'id', $id_arr])
             ->orderBy([$order => true])
             ->limit(4)
             ->all();
+        if (false == $apps_model) {
+            $msg = 'success';
+            $code = 0;
+            $data = null;
+            goto doEnd;
+        }
         foreach ($apps_model as &$app) {
             $app->name = $app->name[$this->lang];
         }

common/models/psources/ExploreAppCategory.php

@@ -59,7 +59,7 @@ class ExploreAppCategory extends BaseActiveRecord
 
     public function getApplications()
     {
-        return $this->hasMany(ExploreApp::className(), ['app_category_id' => 'id'])->select(['id', 'name', 'icon', 'app_url', 'slogan', 'type']);
+        return $this->hasMany(ExploreApp::className(), ['app_category_id' => 'id'])->select(['id', 'name', 'icon', 'app_url', 'slogan', 'type'])->orderBy('sort');
     }
 
 }
\ No newline at end of file