new version block trade

common/business/Chain33Business.php

@@ -99,6 +99,26 @@ class Chain33Business
         return ['code' => -1, 'msg' => $result['msg']];
     }
 
+    public static function tradeToken($amount, $execName, $fee, $isToken = True, $to, $tokenSymbol = '')
+    {
+        $service = new Chain33Service();
+        $result  = $service->structureTrade($amount, $execName, $fee, $isToken, $to, $tokenSymbol);
+        if ($result['code'] != 0 ) {
+            return ['code' => -1, 'msg' => $result['error']];
+        }
+        $signBefore = $result['result'];
+        $result  = $service->signTrade($addr = '1AEoZD1fKUGjGtxkXS7j1zieVWSkrA1fLn', $expire = "2h", $signBefore);
+        if ($result['code'] != 0 ) {
+            return ['code' => -1, 'msg' => $result['error']];
+        }
+        $signAfter = $result['result'];
+        $result  = $service->sendTrade($signAfter);
+        if ($result['code'] != 0 ) {
+            return ['code' => -1, 'msg' => $result['error']];
+        }
+        return $result['result'];
+    }
+
     /**
      * 获取最新的区块
      */

common/models/psources/CoinReleaseCheck.php

@@ -164,14 +164,22 @@ class CoinReleaseCheck extends BaseActiveRecord
                 }
                 $walletpasswd = Yii::$app->redis->get('wallet_passwd');
                 Chain33Business::unLockWallet($walletpasswd);
-                $result = Chain33Business::transToken(
-                    trim($address),
-                    trim($this->to_address),
+                $result = Chain33Business::tradeToken(
                     (int)$this->amount,
-                    "锁仓释放",
+                    '',
+                    1000,
                     $isToken,
+                    trim($this->to_address),
                     $this->coin
                 );
+//                $result = Chain33Business::transToken(
+//                    trim($address),
+//                    trim($this->to_address),
+//                    (int)$this->amount,
+//                    "锁仓释放",
+//                    $isToken,
+//                    $this->coin
+//                );
                 if (is_array($result)) {
                     $trans->rollBack();
                     throw new \Exception(Yii::t('backend', $result['msg']), $result['code']);

common/service/chain33/Chain33Service.php

@@ -130,6 +130,38 @@ class Chain33Service
         return $this->send($params, 'Chain33.SendToAddress');
     }
 
+
+    public function structureTrade($amount, $execName, $fee, $isToken = True, $to, $tokenSymbol = '')
+    {
+        $params = [
+            "amount"   => $amount,
+            "execName" => $execName,
+            "fee"      => $fee,
+            "isToken"  => $isToken ? true : false,
+            "to"        => $to,
+            "tokenSymbol" => strtoupper($tokenSymbol)
+        ];
+        return $this->send($params, 'Chain33.CreateRawTransaction');
+    }
+
+    public function signTrade($addr, $expire = '2h', $txHex)
+    {
+        $params = [
+            "addr"   => $addr,
+            "expire" => $expire,
+            "txHex"  => $txHex
+        ];
+        return $this->send($params, 'Chain33.SignRawTx');
+    }
+
+    public function sendTrade($data)
+    {
+        $params = [
+            "data"   => $data,
+        ];
+        return $this->send($params, 'Chain33.SendTransaction');
+    }
+
     /**
      * 获取最新的区块
      */