Merge branch 'master' into develop

common/models/psources/CoinIssueCoin.php

@@ -85,7 +85,10 @@ 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])->orderBy('id desc')->one();
+            $model = CoinIssueCoin::find()
+                ->where(['name' => $this->name, 'platform_id' => $this->platform_id, 'status' => CoinIssueCoin::STATUS_SUCCESS])
+                ->andWhere(['<>', 'status', CoinIssueCoin::STATUS_FAILED])
+                ->orderBy('id desc')->one();
             if ($model) {
                 $this->addError($attribute, 'Token名称已存在');
                 return false;
@@ -112,7 +115,10 @@ 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])->orderBy('id desc')->one();
+            $model = CoinIssueCoin::find()
+                ->where(['symbol' => $this->symbol, 'platform_id' => $this->platform_id, 'status' => CoinIssueCoin::STATUS_SUCCESS])
+                ->andWhere(['<>', 'status', CoinIssueCoin::STATUS_FAILED])
+                ->orderBy('id desc')->one();
             if ($model) {
                 $this->addError($attribute, 'Token名称已存在');
                 return false;

wallet/controllers/IssueChainController.php

@@ -231,7 +231,7 @@ class IssueChainController extends BaseController
                 if (!empty($coin_model)) {
                     array_unshift($symbol, $coin_model->name);
                 }
-                //array_unshift($symbol, 'BTY');
+                array_unshift($symbol, 'BTY');
                 $val->tokens = $symbol;
                 $val->platform_id = Yii::$app->params['chain_nodes'][strtoupper($val->platform)]['platform_id'];
             }