Merge branch 'master' into feature/ticker

api/controllers/ServiceController.php

@@ -100,7 +100,7 @@ class ServiceController extends BaseController
         $type = Yii::$app->request->get('type', 1);
         $coin_recommendItems = $this->coinRecommendList($platform_id, $type);
         $fields = ['id', 'sid', 'icon', 'name', 'nickname', 'chain', 'platform'];
-        $rows = Coin::getSelectList(1, 999, $fields, [['in', 'id', $coin_recommendItems]]);
+        $rows = Coin::getSelectList(1, 999, $fields, [['in', 'id', $coin_recommendItems]], $coin_recommendItems);
         foreach ($rows['data'] as $key => &$value) {
             $nickname = json_decode($value['nickname'], true);
             $value['nickname'] = $nickname[$this->lang];
@@ -114,7 +114,7 @@ class ServiceController extends BaseController
      */
     private function coinRecommendList($platform_id, $type = 1)
     {
-        $recommend_list = CoinRecommend::find()->select('cid')->where(['platform_id' => $platform_id, 'type' => $type])->all();
+        $recommend_list = CoinRecommend::find()->select('cid')->where(['platform_id' => $platform_id, 'type' => $type])->orderBy('sort')->all();
         if ($recommend_list) {
             $coin_ids = array_column($recommend_list, 'cid');
             return $coin_ids;

common/models/psources/Coin.php

@@ -63,14 +63,23 @@ class Coin extends BaseActiveRecord
      * @param  array $condition
      * @return array|\yii\db\ActiveRecord[]
      */
-    public static function getSelectList($page = 1, $limit = 10, $columns = [], $condition = [])
+    public static function getSelectList($page = 1, $limit = 10, $columns = [], $condition = [], $orderBy = [])
     {
+        $ids_str = implode(',', $orderBy);
+        $order = "FIELD(`id`,$ids_str)";
         $query = self::find();
         foreach ($condition as $item) {
             $query = $query->andWhere($item);
         }
         $count = $query->count();
+        if (false != $orderBy) {
+            $ids_str = implode(',', $orderBy);
+            $order = "FIELD(`id`,$ids_str)";
+            $data = $query->select($columns)->offset(($page - 1) * $limit)->limit($limit)->asArray()->orderBy([$order => true])->all();
+        } else {
             $data = $query->select($columns)->offset(($page - 1) * $limit)->limit($limit)->asArray()->all();
+        }
+
         return ['count' => $count, 'data' => $data];
     }