Merge branch 'feature/ticker' into 'master'

api/controllers/PlatformCoinsController.php

@@ -81,20 +81,20 @@ class PlatformCoinsController extends BaseController
             return ['code' => -1, 'data' => null, 'msg' => '数据导入失败'];
         }
 
-        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();
-            if (false == $is_air_drop) {
-                $model = new CoinAirDropTransfer();
-                $model->txhash = '0';
-                $model->msg = '';
-                $model->to_address = $to_address;
-                $model->coin_name = 'EPC';
-                $model->amount = 1.3;
-                $model->origin = CoinAirDropTransfer::ORIGIN_API;
-                $model->type = CoinAirDropTransfer::TYPE_COINS;
-                $model->save();
-            }
-        }
+//        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();
+//            if (false == $is_air_drop) {
+//                $model = new CoinAirDropTransfer();
+//                $model->txhash = '0';
+//                $model->msg = '';
+//                $model->to_address = $to_address;
+//                $model->coin_name = 'EPC';
+//                $model->amount = 1.3;
+//                $model->origin = CoinAirDropTransfer::ORIGIN_API;
+//                $model->type = CoinAirDropTransfer::TYPE_COINS;
+//                $model->save();
+//            }
+//        }
 
         return ['code' => 0, 'data' => null, 'msg' => '数据导入成功'];
     }

api/controllers/TickerController.php

@@ -320,6 +320,7 @@ class TickerController extends BaseController
             ];
         }
         if (17 == $platform_id) {
+            return ['code' => $this->code, 'msg' => $this->msg, 'data' => $this->data];
             $datas = [
                 [
                     'exchange' => 'huobi',