Merge branch 'master' into feature/issue_coin

api/controllers/ExploreController.php

@@ -30,7 +30,7 @@ class ExploreController extends BaseController
         }
         foreach ($app_category_model as $key => $val) {
             unset($val->apps);
-            $val->name = $val->name[$this->lang];
+            $val->name = isset($val->name[$this->lang]) ? $val->name[$this->lang] : '';
             $apps_model = ExploreApp::find()->select('id, name, icon, type, app_url, slogan')
                 ->where(['app_category_id' => (int)$val->id, 'status' => ExploreApp::STATUS_ON])
                 ->orderBy('sort')
@@ -41,7 +41,7 @@ class ExploreController extends BaseController
                 continue;
             }
             foreach ($apps_model as &$app) {
-                $app->name = $app->name[$this->lang];
+                $app->name = isset($app->name[$this->lang]) ? $app->name[$this->lang] : '';
             }
             $val->apps = $apps_model;
             unset($val->sort);
@@ -79,9 +79,9 @@ class ExploreController extends BaseController
         }
         foreach ($app_category_model as &$val) {
             foreach ($val->applications as $app) {
-                $app->name = $app->name[$this->lang];
+                $app->name = isset($app->name[$this->lang]) ? $app->name[$this->lang] : '';
             }
-            $val->name = $val->name[$this->lang];
+            $val->name = isset($val->name[$this->lang]) ? $val->name[$this->lang] : '';
             $val->apps = $val->applications;
             unset($val->id);
             unset($val->sort);
@@ -124,7 +124,7 @@ class ExploreController extends BaseController
             goto doEnd;
         }
         foreach ($apps_model as &$app) {
-            $app->name = $app->name[$this->lang];
+            $app->name = isset($app->name[$this->lang]) ? $app->name[$this->lang] : '';
         }
         $data = $apps_model;
         $msg = 'success';

common/business/ExchangeBusiness.php

@@ -130,6 +130,13 @@ class ExchangeBusiness
             goto doEnd;
         }
 
+        if (in_array(strtoupper($tag), ['BNC'])) {
+            $exchange = ExchangeFactory::createExchange("Bitnasdaq");
+            $quotation = $exchange->getTicker($tag, 'USDT');
+            $quotation['rmb'] = (float)sprintf("%0.2f", $quotation['last']);
+            goto doEnd;
+        }
+
         if (in_array(strtoupper($tag), ['GM', 'BSTC'])) {
             $exchange = ExchangeFactory::createExchange("Token7");
             $quotation = $exchange->getTicker($tag, 'HA');
@@ -289,7 +296,7 @@ class ExchangeBusiness
         $exchange = ExchangeFactory::createExchange("Go");
         $rate = $exchange->getTicker("CNY", "USD");
         $cny_usd_rate = 1 / $rate['last'];
-        if (in_array(strtoupper($tag), ['FOLI', 'CIC', 'KPC8', 'BVA'])) {
+        if (in_array(strtoupper($tag), ['FOLI', 'CIC', 'KPC8', 'BVA', 'DAG', 'BNC'])) {
             $quotation['usd'] = (float)sprintf("%0.4f", $quotation['last']);
             $quotation['rmb'] = (float)sprintf("%0.4f", $quotation['last'] / $cny_usd_rate);
         } else if (in_array(strtoupper($tag), ['SUSD'])) {