Merge branch 'feature/fast_iterative' into develop

api/controllers/SupportedChainController.php

@@ -2,6 +2,7 @@
 
 namespace api\controllers;
 
+use common\business\ExchangeBusiness;
 use Yii;
 use api\base\BaseController;
 use common\models\psources\CoinSupportedChain;
@@ -28,10 +29,29 @@ class SupportedChainController extends BaseController
         }
         $data = [];
         foreach ($supported_chain_model as $key => &$val) {
-            $data[$key]['coin_id'] = isset($val->coin->id) ? $val->coin->id : '';
-            $data[$key]['chain'] = isset($val->coin->chain) ? $val->coin->chain : '';
+            $data[$key]['id'] = isset($val->coin->id) ? $val->coin->id : '';
+            $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;
+
+            $ticker = ExchangeBusiness::getquatation($val->coin->name);
+            if (false != $ticker) {
+                $data[$key]['rmb'] = $ticker['rmb'];
+                $data[$key]['usd'] = $ticker['usd'];
+            }
+
         }
         $msg = 'success';
         $code = 0;

common/models/psources/CoinSupportedChain.php

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