Merge branch 'feature/optimize' into 'master'

common/service/chain33/Chain33Service.php

@@ -231,7 +231,11 @@ class Chain33Service
         $params = [
             'data' => $data
         ];
-        return $this->send($params, 'Chain33.SendTransaction');
+        $timeout = [
+            'connect_timeout' => 50000,
+            'timeout_ms' => 50000
+        ];
+        return $this->send($params, 'Chain33.SendTransaction', $timeout);
     }
 
     public function QueryTransaction($data)
@@ -419,6 +423,16 @@ class Chain33Service
         return $this->send($params, 'Chain33.Query');
     }
 
+    public function chainQuery($execer, $funcName, $param)
+    {
+        $params = [
+            'execer' => $execer,
+            'funcName' => $funcName,
+            'payload' => $param
+        ];
+        return $this->send($params, 'Chain33.Query');
+    }
+
     /**
      * @param array $hashes
      * @return array

console/controllers/OrderController.php

@@ -162,11 +162,16 @@ class OrderController extends Controller
             //3步交易情况下需要做高度判断，2步交易注释IF判断
             if (CoinCTocTransfer::CONSENSUE_YES == $val['consensus'] && true == $switch && isset($height)) {
                 $service = new Chain33Service($node);
-                $result = $service->getHeight($val['consensus_platform']);
+                $execer = 'paracross';
+                $func_name = 'GetTitle';
+                $playload = [
+                    'data' => 'user.p.'.$val['consensus_platform'] . '.'
+                ];
+                $result = $service->chainQuery($execer, $func_name, $playload);
                 if (!isset($result['result'])) {
                     continue;
                 }
-                $consensHeight = $result['result']['consensHeight'];
+                $consensHeight = $result['result']['height'];
                 if ($consensHeight < $height) {
                     continue;
                 }