Merge branch 'feature/ticker' into 'master'

api/controllers/TickerController.php

@@ -20,6 +20,7 @@ class TickerController extends BaseController
     {
         $page = Yii::$app->request->get('page', 1);
         $device_code = Yii::$app->request->get('device_code', '');
+        $platform_id = Yii::$app->request->get('device_code', 0);
         $exchange = Yii::$app->request->get('exchange', 'zhaobi');
         $data_value = Yii::$app->request->get('data-value', '');
         $sort = Yii::$app->request->get('sort', '');
@@ -38,7 +39,12 @@ class TickerController extends BaseController
         $data = $result['data'];
 
         if (false != $device_code) {
+            if (false != $platform_id) {
                 $coin_optional = CoinOptional::find()->select('symbol')->where(['platform' => $exchange, 'device_code' => $device_code])->asArray()->all();
+            } else {
+                $coin_optional = CoinOptional::find()->select('symbol')->where(['platform' => $exchange, 'device_code' => $device_code, 'platform_id' => $platform_id])->asArray()->all();
+            }
+
             $coin_optional = ArrayHelper::getColumn($coin_optional, 'symbol');
             foreach ($data['ticker'] as &$val) {
                 if (in_array($val['symbol'], $coin_optional)) {
@@ -67,7 +73,7 @@ class TickerController extends BaseController
         $params = json_encode($data);
         $curl->setHeader('Content-Type', 'application/json');
         $curl->setRawPostData($params);
-        $res = $curl->post('https://b.biqianbao.net/interface/coin/coin-index', true);
+        $res = $curl->post(Yii::$app->params['biqianbao'] . '/interface/coin/coin-index', true);
         $res = json_decode($res, true);
         foreach ($res['data'] as $val) {
             $this->basic_price[$val['name']]['rmb'] = $val['rmb'];
@@ -89,7 +95,7 @@ class TickerController extends BaseController
                 $msg = '参数错误';
                 goto doEnd;
             }
-            $model = CoinOptional::find()->where(['device_code' => $device_code, 'symbol' => $symbol])->one();
+            $model = CoinOptional::find()->where(['device_code' => $device_code, 'symbol' => $symbol, 'platform_id' => (int)$platform_id])->one();
             if ($model) {
                 $msg = '数据已存在!';
                 goto doEnd;
@@ -155,7 +161,7 @@ class TickerController extends BaseController
                 $temp['close'] = number_format($quotation['last'], 6, '.', '');
                 $temp['close_usd'] = (float)sprintf("%0.6f", $quotation['last'] * $this->basic_price[$tag_second]['usd']);
                 $temp['close_rmb'] = (float)sprintf("%0.4f", $quotation['last'] * $this->basic_price[$tag_second]['rmb']);
-                $temp['change'] = (0 == $quotation['open']) ? 0 : (float)sprintf("%0.4f", ($quotation['last'] - $quotation['open']) / $quotation['open'] * 100);
+                $temp['change'] = (0 == $quotation['open']) ? 0 : (float)sprintf("%0.2f", ($quotation['last'] - $quotation['open']) / $quotation['open'] * 100);
                 $temp['high_usd'] = (float)sprintf("%0.4f", $quotation['high'] * $this->basic_price[$tag_second]['usd']);
                 $temp['low_usd'] = (float)sprintf("%0.4f", $quotation['low'] * $this->basic_price[$tag_second]['usd']);
                 $temp['high_rmb'] = (float)sprintf("%0.4f", $quotation['high'] * $this->basic_price[$tag_second]['rmb']);

common/service/exchange/factory/BinanceBuilder.php

@@ -90,7 +90,7 @@ class BinanceBuilder extends FactoryService
                     $temp['close'] = number_format($close, 6, '.', '');
                     $temp['close_usd'] = (float)sprintf("%0.6f", $close * $this->basic_price[$coin]['usd']);
                     $temp['close_rmb'] = (float)sprintf("%0.4f", $close * $this->basic_price[$coin]['rmb']);
-                    $temp['change'] = (0 == $open) ? 0 : (float)sprintf("%0.4f", ($close - $open) / $open * 100);
+                    $temp['change'] = (0 == $open) ? 0 : (float)sprintf("%0.2f", ($close - $open) / $open * 100);
                     $temp['high_usd'] = (float)sprintf("%0.4f", $high * $this->basic_price[$coin]['usd']);
                     $temp['low_usd'] = (float)sprintf("%0.4f", $low * $this->basic_price[$coin]['usd']);
                     $temp['high_rmb'] = (float)sprintf("%0.4f", $high * $this->basic_price[$coin]['rmb']);

common/service/exchange/factory/FactoryService.php

@@ -35,7 +35,7 @@ abstract class FactoryService
         $params = json_encode($data);
         $curl->setHeader('Content-Type', 'application/json');
         $curl->setRawPostData($params);
-        $res = $curl->post('http://127.0.0.1:8082/interface/coin/coin-index', true);
+        $res = $curl->post(\Yii::$app->params['biqianbao'].'/interface/coin/coin-index', true);
         $res = json_decode($res, true);
 
         foreach ($res['data'] as $val) {

common/service/exchange/factory/HuobiBuilder.php

@@ -90,7 +90,7 @@ class HuobiBuilder extends FactoryService
                     $temp['close'] = number_format($close, 6, '.', '');
                     $temp['close_usd'] = (float)sprintf("%0.6f", $close * $this->basic_price[$coin]['usd']);
                     $temp['close_rmb'] = (float)sprintf("%0.4f", $close * $this->basic_price[$coin]['rmb']);
-                    $temp['change'] = (false == $open) ? 0 : (float)sprintf("%0.4f", ($close - $open) / $open * 100);
+                    $temp['change'] = (false == $open) ? 0 : (float)sprintf("%0.2f", ($close - $open) / $open * 100);
                     $temp['high_usd'] = (float)sprintf("%0.4f", $high * $this->basic_price[$coin]['usd']);
                     $temp['low_usd'] = (float)sprintf("%0.4f", $low * $this->basic_price[$coin]['usd']);
                     $temp['high_rmb'] = (float)sprintf("%0.4f", $high * $this->basic_price[$coin]['rmb']);

common/service/exchange/factory/ZhaobiBuilder.php

@@ -41,7 +41,7 @@ class ZhaobiBuilder extends FactoryService
                         $temp['close'] = number_format($val['last'], 6, '.', '');
                         $temp['close_usd'] = (float)sprintf("%0.6f", $val['last'] * $this->basic_price[$coin]['usd']);
                         $temp['close_rmb'] = (float)sprintf("%0.4f", $val['last'] * $this->basic_price[$coin]['rmb']);
-                        $temp['change'] = (0 == $val['open']) ? 0 : (float)sprintf("%0.4f", ($val['last'] - $val['open']) / $val['open'] * 100);
+                        $temp['change'] = (0 == $val['open']) ? 0 : (float)sprintf("%0.2f", ($val['last'] - $val['open']) / $val['open'] * 100);
                         $temp['high_usd'] = (float)sprintf("%0.4f", $val['high'] * $this->basic_price[$coin]['usd']);
                         $temp['low_usd'] = (float)sprintf("%0.4f", $val['low'] * $this->basic_price[$coin]['usd']);
                         $temp['high_rmb'] = (float)sprintf("%0.4f", $val['high'] * $this->basic_price[$coin]['rmb']);