Merge branch 'feature/optimize' into 'master'

console/controllers/OrderController.php

@@ -161,11 +161,12 @@ class OrderController extends Controller
 
             //3步交易情况下需要做高度判断，2步交易注释IF判断
             if (CoinCTocTransfer::CONSENSUE_YES == $val['consensus'] && true == $switch && isset($height)) {
+                $last_hash = $result['result']['tx']['hash'];
                 $service = new Chain33Service($node);
                 $execer = 'paracross';
                 $func_name = 'GetTitle';
                 $playload = [
-                    'data' => 'user.p.'.$val['consensus_platform'] . '.'
+                    'data' => 'user.p.' . $val['consensus_platform'] . '.'
                 ];
                 $result = $service->chainQuery($execer, $func_name, $playload);
                 if (!isset($result['result'])) {
@@ -175,6 +176,19 @@ class OrderController extends Controller
                 if ($consensHeight < $height) {
                     continue;
                 }
+
+                $func_name = 'GetAssetTxResult';
+                $playload = [
+                    'data' => $last_hash
+                ];
+                $result = $service->chainQuery($execer, $func_name, $playload);
+                if (!isset($result['result'])) {
+                    continue;
+                }
+                $tx_result = $result['result']['success'];
+                if (false == $tx_result) {
+                    continue;
+                }
             }
             $currentModel = CoinCTocTransfer::findOne($val['id']);
             $currentModel->query_result = $query_result;