Merge branch 'feature/ticker' into 'master'

console/controllers/OrderController.php

@@ -103,9 +103,6 @@ class OrderController extends Controller
 //            'host' => '172.16.100.77',
 //            'port' => 8801
 //        ];
-        $service = new Chain33Service($node_params);
-        $result = $service->getHeight();
-        $consensHeight = $result['result']['consensHeight'];
 
         $current_time = time();
         foreach ($model as $val) {
@@ -163,9 +160,14 @@ class OrderController extends Controller
             doEnd :
 
             //3步交易情况下需要做高度判断，2步交易注释IF判断
-            if (CoinCTocTransfer::CONSENSUE_YES == $val['consensus'] && true == $switch && isset($height) && ($consensHeight < $height)) {
+            if (CoinCTocTransfer::CONSENSUE_YES == $val['consensus'] && true == $switch && isset($height)) {
+                $service = new Chain33Service($node_params);
+                $result = $service->getHeight();
+                $consensHeight = $result['result']['consensHeight'];
+                if ($consensHeight < $height) {
                     continue;
                 }
+            }
             $currentModel = CoinCTocTransfer::findOne($val['id']);
             $currentModel->query_result = $query_result;
             $currentModel->msg = $msg;