Merge branch 'feature/cross_chain' into 'master'

console/controllers/CrossChainController.php

@@ -66,15 +66,17 @@ class CrossChainController extends Controller
                     $redis->hdel(CoinCrossChain::CROSS_CHAIN_TRANSFERING, $val['address'] . ':' . $val['is_with_draw'] . ':' . $val['id']);
                 }
 
-                if (0 != $result['code'] && (true == strstr($result['msg'], 'Balance'))) {
+                if (0 == $result['code']) {
+                    $send_result = $result['result'];
                     $currentModel = CoinCrossChain::findOne($val['id']);
-                    $currentModel->msg = $result['msg'];
+                    $currentModel->send_result = $send_result;
+                    $currentModel->msg = 0;
                     $currentModel->save();
                     $redis->hdel(CoinCrossChain::CROSS_CHAIN_TRANSFERING, $val['address'] . ':' . $val['is_with_draw'] . ':' . $val['id']);
-                } else if (0 != $result['code'] && (false == strstr($result['msg'], 'ErrDupTx'))) {
-                    $redis->hdel(CoinCrossChain::CROSS_CHAIN_TRANSFERING, $val['address'] . ':' . $val['is_with_draw'] . ':' . $val['id']);
                 } else {
-
+                    $currentModel = CoinCrossChain::findOne($val['id']);
+                    $currentModel->msg = $result['msg'];
+                    $currentModel->save();
                 }
             });
         }
@@ -124,7 +126,6 @@ class CrossChainController extends Controller
             #$result = $service->QueryTransaction($send_result);
             $switch = true;
             $result = $this->queryTransaction($node_params, $send_result);
-
             if (isset($result['result']['actionName']) && 'unknown' == $result['result']['actionName']) {
                 $redis->hdel(CoinCrossChain::CROSS_CHAIN_CACHE_FAIL, $val['address'] . ':' . $val['is_with_draw']);
                 $query_result = 'success';
@@ -206,6 +207,21 @@ class CrossChainController extends Controller
             }
         }
 
-        return $result;
+        if (isset($result['result']['receipt']) && is_array($result['result']['receipt']['logs'])){
+            foreach ($result['result']['receipt']['logs'] as $log) {
+                if (isset($log['tyName']) && 'logerr' == strtolower($log['tyName'])){
+                    return $result;
+                }
+            }
+        }
+
+//        static $result = [];
+//        $service = new Chain33Service($node_params);
+//        $result = $service->QueryTransaction($send_result);
+//        echo json_encode($result) . PHP_EOL;
+//        if (isset($result['result']['tx']['next'])) {
+//            $this->queryTransaction($node_params, $result['result']['tx']['next']);
+//        }
+//        return $result;
     }
 }
\ No newline at end of file