Merge branch 'feature/cross_chain' into 'master'

common/business/ExchangeBusiness.php

@@ -85,7 +85,7 @@ class ExchangeBusiness
             goto doEnd;
         }
 
-        if (strtoupper($tag) == 'RYH' || strtoupper($tag) == 'WL' || strtoupper($tag) == 'ETS' || strtoupper($tag) == 'LIMS' || strtoupper($tag) == 'AT' || strtoupper($tag) == 'BTJ') {
+        if (strtoupper($tag) == 'RYH' || strtoupper($tag) == 'CNDT' || strtoupper($tag) == 'WL' || strtoupper($tag) == 'ETS' || strtoupper($tag) == 'LIMS' || strtoupper($tag) == 'AT' || strtoupper($tag) == 'BTJ') {
             $quotation = [
                 'low' => 0,
                 'high' => 0,

console/controllers/CrossChainController.php

@@ -33,8 +33,8 @@ class CrossChainController extends Controller
                 continue;
             }
 
-            go(function () use ($val) {
-                \Co::sleep(0.5);
+            //go(function () use ($val) {
+            //    \Co::sleep(0.5);
                 $node_params = $val['transfer_url'];
                 $node_params = explode(':', $node_params);
                 $node_params = [
@@ -62,7 +62,7 @@ class CrossChainController extends Controller
                 }
                 $currentModel->save();
 
-            });
+            //});
         }
         echo date('Y-m-d H:i:s') . '跨链交易成功' . PHP_EOL;
         return 0;
@@ -89,6 +89,7 @@ class CrossChainController extends Controller
             $send_result = $val['send_result'];
             $result = $service->QueryTransaction($send_result);
             if (-1 == $result['code']) {
+                if('tx not exist' == $result['msg']) continue;
                 $msg = $result['msg'];
                 $query_result = $result['code'];
                 goto doEnd;