Merge branch 'feature/issue_coin' into 'master'

api/controllers/WalletController.php

@@ -113,8 +113,7 @@ class WalletController extends BaseController
         }
 
         $coin_model = Coin::find()->select('name, treaty')->where(['name' => strtoupper($symbol), 'platform' => $platform->platform])->one();
-        $service = new Chain33Service($node);
-        $address[] = $token;
+
 
 
         $switch = false;
@@ -129,10 +128,18 @@ class WalletController extends BaseController
             }
         }
 
+        if ('BTY' == strtoupper($symbol)) {
+            $switch = true;
+            $node = \Yii::$app->params['chain_parallel']['primary'];
+        }
+
+        $service = new Chain33Service($node);
+        $address[] = $token;
+
         if (false == $switch) {
             $result = $service->getTokenBalance($address, $execer, $symbol);
         } else {
-            $result = $service->getBalance($address, $execer);
+            $result = $service->getBalance($address, $execer = '');
         }
 
         if (0 !== $result['code']) {

common/models/psources/CoinIssueCoin.php

@@ -48,7 +48,7 @@ class CoinIssueCoin extends CommonActiveRecord
         return [
             [['name', 'symbol', 'total', 'owner', 'introduction', 'category', 'type', 'platform_id', 'chain_id', 'charge_unit', 'charge'], 'required'],
             [['total', 'category', 'type', 'platform_id', 'chain_id'], 'integer'],
-            [['introduction','charge_unit'], 'string', 'length' => [1, 20]],
+            [['introduction', 'charge_unit'], 'string', 'length' => [1, 20]],
             ['symbol', 'string', 'length' => [1, 6]],
             ['name', 'string', 'length' => [1, 20]],
             #['status', 'in', 'range' => [1, 2, 0]],
@@ -86,7 +86,7 @@ class CoinIssueCoin extends CommonActiveRecord
         //非增发
         if (CoinIssueCoin::TYPE_NO == $this->type) {
             $model = CoinIssueCoin::find()
-                ->where(['name' => $this->name, 'platform_id' => $this->platform_id, 'status' => CoinIssueCoin::STATUS_SUCCESS])
+                ->where(['name' => $this->name, 'platform_id' => $this->platform_id])
                 ->andWhere(['<>', 'status', CoinIssueCoin::STATUS_FAILED])
                 ->orderBy('id desc')->one();
             if ($model) {
@@ -116,7 +116,7 @@ class CoinIssueCoin extends CommonActiveRecord
         }
         if (CoinIssueCoin::TYPE_NO == $this->type) {
             $model = CoinIssueCoin::find()
-                ->where(['symbol' => $this->symbol, 'platform_id' => $this->platform_id, 'status' => CoinIssueCoin::STATUS_SUCCESS])
+                ->where(['symbol' => $this->symbol, 'platform_id' => $this->platform_id])
                 ->andWhere(['<>', 'status', CoinIssueCoin::STATUS_FAILED])
                 ->orderBy('id desc')->one();
             if ($model) {

common/service/chain33/Chain33Service.php

@@ -256,7 +256,7 @@ class Chain33Service
         return $this->send($params, 'Chain33.Query');
     }
 
-    public function getBalance($address, $execer)
+    public function getBalance($address, $execer = "")
     {
         $params = [
             'addresses' => $address,