Merge branch 'feature/trade-node' into 'master'

自动审核更新 See merge request !22

Merge branch 'feature/trade-node' into 'master'
1a1edc91 · shajiaiming · b010f89b · b75dc2a7 · 1a1edc91
Commit 1a1edc91 authored May 29, 2019 by shajiaiming
Hide whitespace changes
Inline Side-by-side

Showing with 4 additions and 4 deletions

ReleaseCheckController.php console/controllers/ReleaseCheckController.php +4 -4

No files found.
--- a/console/controllers/ReleaseCheckController.php
+++ b/console/controllers/ReleaseCheckController.php
@@ -74,12 +74,12 @@ class ReleaseCheckController extends Controller
                    $walletpasswd = Yii::$app->redis->get('wallet_passwd');
                    $node_params = Yii::$app->params['chain_parallel']['secondary'];
                    Chain33Business::unLockWallet($walletpasswd, $node_params);
-                    $result = Chain33Business::transToken(
-                        trim($from),
-                        trim($coin_release_check->to_address),
+                    $result = Chain33Business::tradeToken(
                        (int)$coin_release_check->amount,
-                        "锁仓释放",
+                        '',
+                        1000,
                        $isToken,
+                        trim($coin_release_check->to_address),
                        $coin_release_check->coin,
                        $node_params
                    );