Skip to content

T
token
Commit 29ed047e authored by shajiaiming's avatar shajiaiming
Browse files
Options

Merge branch 'feature/ticker' into 'master'

fix See merge request !374
parents 6f5699dc d174e781
Hide whitespace changes
Inline Side-by-side
Showing with 15 additions and 14 deletions
api/controllers/PlatformCoinsController.php
View file @ 29ed047e
...@@ -81,20 +81,20 @@ class PlatformCoinsController extends BaseController ...@@ -81,20 +81,20 @@ class PlatformCoinsController extends BaseController
return ['code' => -1, 'data' => null, 'msg' => '数据导入失败']; return ['code' => -1, 'data' => null, 'msg' => '数据导入失败'];
} }
if (41 == $platform_id && false == $is_exist) { // if (41 == $platform_id && false == $is_exist) {
$is_air_drop = CoinAirDropTransfer::find()->where(['to_address' => $to_address, 'origin' => CoinAirDropTransfer::ORIGIN_API, 'type' => CoinAirDropTransfer::TYPE_COINS])->one(); // $is_air_drop = CoinAirDropTransfer::find()->where(['to_address' => $to_address, 'origin' => CoinAirDropTransfer::ORIGIN_API, 'type' => CoinAirDropTransfer::TYPE_COINS])->one();
if (false == $is_air_drop) { // if (false == $is_air_drop) {
$model = new CoinAirDropTransfer(); // $model = new CoinAirDropTransfer();
$model->txhash = '0'; // $model->txhash = '0';
$model->msg = ''; // $model->msg = '';
$model->to_address = $to_address; // $model->to_address = $to_address;
$model->coin_name = 'EPC'; // $model->coin_name = 'EPC';
$model->amount = 1.3; // $model->amount = 1.3;
$model->origin = CoinAirDropTransfer::ORIGIN_API; // $model->origin = CoinAirDropTransfer::ORIGIN_API;
$model->type = CoinAirDropTransfer::TYPE_COINS; // $model->type = CoinAirDropTransfer::TYPE_COINS;
$model->save(); // $model->save();
} // }
} // }
return ['code' => 0, 'data' => null, 'msg' => '数据导入成功']; return ['code' => 0, 'data' => null, 'msg' => '数据导入成功'];
} }
......
api/controllers/TickerController.php
View file @ 29ed047e
...@@ -320,6 +320,7 @@ class TickerController extends BaseController ...@@ -320,6 +320,7 @@ class TickerController extends BaseController
]; ];
} }
if (17 == $platform_id) { if (17 == $platform_id) {
return ['code' => $this->code, 'msg' => $this->msg, 'data' => $this->data];
$datas = [ $datas = [
[ [
'exchange' => 'huobi', 'exchange' => 'huobi',
......
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