Merge branch 'feature/optimize' into develop

api/controllers/RecommendCoinController.php

@@ -3,6 +3,7 @@
 namespace api\controllers;
 
 use common\business\ExchangeBusiness;
+use common\models\psources\CoinSupportedChain;
 use Yii;
 use api\base\BaseController;
 use common\models\psources\WalletRecommendCoin;
@@ -39,7 +40,6 @@ class RecommendCoinController extends BaseController
                 $temp['platform'] = $coin->coin['platform'];
                 $temp['chain'] = $coin->coin['chain'];
                 $temp['treaty'] = $coin->coin['treaty'];
-                $temp['exchange_id'] = $coin->coin['exchange_id'];
                 $nickname = json_decode($coin->coin['nickname'], true);
                 $temp['nickname'] = isset($nickname[$this->lang]) ? $nickname[$this->lang] : '';
                 $introduce = json_decode($coin->coin['introduce'], true);
@@ -92,6 +92,7 @@ class RecommendCoinController extends BaseController
             $category['name'] = isset($name[$this->lang]) ? $name[$this->lang] : '';
 
             $recommend_coin = WalletRecommendCoin::find()->where(['category_id' => $category['id']])->all();
+            unset($category['id']);
             $items = [];
             foreach ($recommend_coin as $coin) {
                 $temp['icon'] = $coin->coin['icon'];
@@ -99,7 +100,6 @@ class RecommendCoinController extends BaseController
                 $temp['platform'] = $coin->coin['platform'];
                 $temp['chain'] = $coin->coin['chain'];
                 $temp['treaty'] = $coin->coin['treaty'];
-                $temp['exchange_id'] = $coin->coin['exchange_id'];
                 $nickname = json_decode($coin->coin['nickname'], true);
                 $temp['nickname'] = isset($nickname[$this->lang]) ? $nickname[$this->lang] : '';
                 $introduce = json_decode($coin->coin['introduce'], true);
@@ -108,8 +108,26 @@ class RecommendCoinController extends BaseController
             }
             $category['items'] = $items;
         }
-
         $this->data = $recommend_category;
+        $supported_chain_model = CoinSupportedChain::find()->where(['platform_id' => $platform_id])->all();
+        $data = [];
+        if (false != $supported_chain_model) {
+            foreach ($supported_chain_model as $key => &$val) {
+                $data[$key]['icon'] = isset($val->coin->icon) ? $val->coin->icon : '';
+                $data[$key]['name'] = isset($val->coin->name) ? $val->coin->name : '';
+                $data[$key]['platform'] = isset($val->coin->platform) ? $val->coin->platform : '';
+                $data[$key]['chain'] = isset($val->coin->chain) ? $val->coin->chain : '';
+                $data[$key]['treaty'] = isset($val->coin->treaty) ? $val->coin->treaty : '';
+                $data[$key]['nickname'] = isset($val->coin->nickname[$this->lang]) ? $val->coin->nickname[$this->lang] : '';
+                $data[$key]['introduce'] = isset($val->coin->introduce[$this->lang]) ? $val->coin->introduce[$this->lang] : '';
+            }
+            $supported_chain = [
+                'name' => '主链',
+                'items' => $data
+            ];
+            array_unshift($this->data, $supported_chain);
+        }
+
         doEnd :
         return ['code' => $this->code, 'data' => $this->data, 'msg' => $this->msg];
     }

api/controllers/SupportedChainController.php

@@ -33,15 +33,10 @@ class SupportedChainController extends BaseController
             $data[$key]['name'] = isset($val->coin->name) ? $val->coin->name : '';
             $data[$key]['icon'] = isset($val->coin->icon) ? $val->coin->icon : '';
             $data[$key]['name'] = isset($val->coin->name) ? $val->coin->name : '';
-            $data[$key]['sid'] = isset($val->coin->sid) ? $val->coin->sid : '';
-
             $data[$key]['nickname'] = isset($val->coin->nickname[$this->lang]) ? $val->coin->nickname[$this->lang] : '';
-
             $data[$key]['chain'] = isset($val->coin->chain) ? $val->coin->chain : '';
             $data[$key]['platform'] = isset($val->coin->platform) ? $val->coin->platform : '';
-            $data[$key]['sort'] = isset($val->coin->sort) ? $val->coin->sort : 0;
             $data[$key]['treaty'] = isset($val->coin->treaty) ? $val->coin->treaty : '';
-            $data[$key]['optional_name'] = isset($val->coin->optional_name) ? $val->coin->optional_name : '';
 
             $data[$key]['rmb'] = 0;
             $data[$key]['usd'] = 0;

common/models/psources/CoinSupportedChain.php

@@ -46,7 +46,7 @@ class CoinSupportedChain extends BaseActiveRecord
 
     public function getCoin()
     {
-        return $this->hasOne(Coin::className(), ['id' => 'coin_id'])
-            ->select('id, sid, icon, name, introduce, optional_name, nickname, platform, chain, treaty');
+        return $this->hasOne(WalletCoin::className(), ['id' => 'coin_id'])
+            ->select('id, icon, name, introduce, nickname, platform, chain, treaty');
     }
 }

common/models/psources/WalletRecommendCoin.php

@@ -19,6 +19,6 @@ class WalletRecommendCoin extends BaseActiveRecord
 
     public function getCoin()
     {
-        return $this->hasOne(WalletCoin::className(), ['id' => 'cid'])->select(['id', 'icon', 'name', 'introduce', 'nickname', 'platform', 'chain', 'treaty', 'exchange_id'])->asArray();
+        return $this->hasOne(WalletCoin::className(), ['id' => 'cid'])->select(['id', 'icon', 'name', 'introduce', 'nickname', 'platform', 'chain', 'treaty'])->asArray();
     }
 }
\ No newline at end of file