Merge branch 'master' into develop

api/controllers/IssueCoinController.php

@@ -228,7 +228,7 @@ class IssueCoinController extends BaseController
         $pages = new Pagination(['totalCount' => $countQuery->count(), 'pageSize' => $size]);
         foreach ($models as &$val) {
             $val->chain_id = $val->chain->platform;
-            if (0 == $val->token_type) {
+            if (35 != $platform_id) {
                 $val->total = (int)$val->total * 1e4;
             }
         }
@@ -268,7 +268,7 @@ class IssueCoinController extends BaseController
             $code = -1;
             goto doEnd;
         }
-        if (0 == $data->token_type) {
+        if (35 != $data->platform_id) {
             $data->total = (int)$data->total * 1e4;
         }
         $data->chain_name = $data->chain->platform;

common/models/psources/CoinIssueCoin.php

@@ -161,7 +161,12 @@ class CoinIssueCoin extends CommonActiveRecord
         }
         $issue_record = CoinIssueCoin::find()->where(['platform_id' => $this->platform_id, 'symbol' => $this->symbol, 'status' => CoinIssueCoin::STATUS_SUCCESS])->sum('total');
         $issue_record = empty($issue_record) ? 0 : $issue_record;
-        if ($issue_record + $this->$attribute > (900 * 1e4)) {
+        if (35 == $this->platform_id) {
+            $unit = 900 * 1e8;
+        } else {
+            $unit = 900 * 1e4;
+        }
+        if ($issue_record + $this->$attribute > $unit) {
             $this->addError($attribute, '最大发行量900亿，目前已发行' . $issue_record . '亿');
             return false;
         }

console/controllers/IssueChainTransferController.php

@@ -256,7 +256,7 @@ class IssueChainTransferController extends Controller
                 if (CoinIssueCoin::TYPE_YES == $val->coin->type) {
                     $params = [
                         'name' => $val->coin->name,
-                        'nickname' => $val->nickname,
+                        'nickname' => $val->coin->nickname,
                         'symbol' => $val->coin->symbol,
                         'introduction' => $val->coin->introduction,
                         'total' => (int)$val->coin->total,
@@ -278,7 +278,7 @@ class IssueChainTransferController extends Controller
                 if (CoinIssueCoin::TYPE_NO == $val->coin->type) {
                     $params = [
                         'name' => $val->coin->name,
-                        'nickname' => $val->nickname,
+                        'nickname' => $val->coin->nickname,
                         'symbol' => $val->coin->symbol,
                         'introduction' => $val->coin->introduction,
                         'total' => (int)$val->coin->total,