Merge branch 'feature/ticker' into 'master'

api/controllers/MarketController.php

@@ -68,12 +68,12 @@ class MarketController extends BaseController
 
         if ('USDT' == strtoupper($base_currency)) {
             $currency_ticker = $exchange->getTicker($currency, 'USDT');
-            if (empty($currency_ticker)){
+            if (empty($currency_ticker)) {
                 $this->code = -1;
                 $this->msg = '此交易所暂不支持所选币种!';
                 goto doEnd;
             }
-            $this->data =  rtrim(sprintf('%.6f',$currency_ticker['last']), '0');
+            $this->data = rtrim(sprintf('%.6f', $currency_ticker['last']), '0');
             goto doEnd;
         }
 
@@ -85,6 +85,9 @@ class MarketController extends BaseController
                 goto doEnd;
             }
             $this->data = rtrim(sprintf('%.6f', 1 / $currency_ticker['last']), '0');
+            if ('.' == substr($this->data, -1)) {
+                $this->data = rtrim($this->data, '.');
+            }
             goto doEnd;
         }
 
@@ -109,7 +112,7 @@ class MarketController extends BaseController
             'rmb' => (float)sprintf("%0.2f", $base_currency_ticker['last']),
         ];
 
-        $this->data =  rtrim(sprintf('%.6f',$currency_quotation['last'] / $base_currency_quotation['last']), '0');
+        $this->data = rtrim(sprintf('%.6f', $currency_quotation['last'] / $base_currency_quotation['last']), '0');
 
         doEnd :