Skip to content

T
token
Commit 2e16fe95 authored by shajiaiming's avatar shajiaiming
Browse files
Options

Merge branch 'master' into feature/issue_coin

parents fc7cfdda 2a67a230
Show whitespace changes
Inline Side-by-side
Showing with 13 additions and 6 deletions
api/controllers/ExploreController.php
View file @ 2e16fe95
...@@ -30,7 +30,7 @@ class ExploreController extends BaseController ...@@ -30,7 +30,7 @@ class ExploreController extends BaseController
} }
foreach ($app_category_model as $key => $val) { foreach ($app_category_model as $key => $val) {
unset($val->apps); 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') $apps_model = ExploreApp::find()->select('id, name, icon, type, app_url, slogan')
->where(['app_category_id' => (int)$val->id, 'status' => ExploreApp::STATUS_ON]) ->where(['app_category_id' => (int)$val->id, 'status' => ExploreApp::STATUS_ON])
->orderBy('sort') ->orderBy('sort')
...@@ -41,7 +41,7 @@ class ExploreController extends BaseController ...@@ -41,7 +41,7 @@ class ExploreController extends BaseController
continue; continue;
} }
foreach ($apps_model as &$app) { 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; $val->apps = $apps_model;
unset($val->sort); unset($val->sort);
...@@ -79,9 +79,9 @@ class ExploreController extends BaseController ...@@ -79,9 +79,9 @@ class ExploreController extends BaseController
} }
foreach ($app_category_model as &$val) { foreach ($app_category_model as &$val) {
foreach ($val->applications as $app) { 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; $val->apps = $val->applications;
unset($val->id); unset($val->id);
unset($val->sort); unset($val->sort);
...@@ -124,7 +124,7 @@ class ExploreController extends BaseController ...@@ -124,7 +124,7 @@ class ExploreController extends BaseController
goto doEnd; goto doEnd;
} }
foreach ($apps_model as &$app) { 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; $data = $apps_model;
$msg = 'success'; $msg = 'success';
......
common/business/ExchangeBusiness.php
View file @ 2e16fe95
...@@ -130,6 +130,13 @@ class ExchangeBusiness ...@@ -130,6 +130,13 @@ class ExchangeBusiness
goto doEnd; 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'])) { if (in_array(strtoupper($tag), ['GM', 'BSTC'])) {
$exchange = ExchangeFactory::createExchange("Token7"); $exchange = ExchangeFactory::createExchange("Token7");
$quotation = $exchange->getTicker($tag, 'HA'); $quotation = $exchange->getTicker($tag, 'HA');
...@@ -289,7 +296,7 @@ class ExchangeBusiness ...@@ -289,7 +296,7 @@ class ExchangeBusiness
$exchange = ExchangeFactory::createExchange("Go"); $exchange = ExchangeFactory::createExchange("Go");
$rate = $exchange->getTicker("CNY", "USD"); $rate = $exchange->getTicker("CNY", "USD");
$cny_usd_rate = 1 / $rate['last']; $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['usd'] = (float)sprintf("%0.4f", $quotation['last']);
$quotation['rmb'] = (float)sprintf("%0.4f", $quotation['last'] / $cny_usd_rate); $quotation['rmb'] = (float)sprintf("%0.4f", $quotation['last'] / $cny_usd_rate);
} else if (in_array(strtoupper($tag), ['SUSD'])) { } else if (in_array(strtoupper($tag), ['SUSD'])) {
......
Markdown is supported
0% or
You are about to add 0 people to the discussion. Proceed with caution.
Finish editing this message first!
Please register or to comment