Merge branch 'feature/optimize' into 'master'

api/controllers/CoinController.php

@@ -223,9 +223,9 @@ class CoinController extends BaseController
             return ['code' => 0, 'data' => []];
         }
         foreach ($names as $key => $val) {
-            if(strpos($val, ',') !== false){
+            if (strpos($val, ',') !== false) {
                 $val_array = explode(',', $val);
-                if('USDT' == strtoupper($val_array[0]) && 'BTC' == strtoupper($val_array[1])) {
+                if ('USDT' == strtoupper($val_array[0]) && 'BTC' == strtoupper($val_array[1])) {
                     $condition[] = [$val_array[0], 'omni'];
                     continue;
                 }
@@ -344,29 +344,29 @@ class CoinController extends BaseController
         $request = Yii::$app->request;
         $platform = $request->get('platform', '');
         $coin_name = $request->get('coinname', '');
-        if (empty($coin_name)) {
         $platform_with_hold = CoinPlatformWithHold::getRecord($platform);
+        if (empty($platform_with_hold)) {
+            return ['code' => 0, 'data' => null];
+        }
+        if (empty($coin_name)) {
             $des = Yii::$app->des;
             $platform_with_hold['private_key'] = $des->encrypt($platform_with_hold['private_key']);
             $platform_with_hold['coins_name'] = '';
             return ['code' => 0, 'data' => $platform_with_hold];
         }
-        $platform_with_hold = CoinPlatformWithHold::getRecord($platform);
         $coin_info = Coin::find()->select('treaty')->where(['name' => strtoupper($coin_name), 'platform' => $platform])->asArray()->one();
         $des = Yii::$app->des;
         $platform_with_hold['private_key'] = $des->encrypt($platform_with_hold['private_key']);
         if (1 == $coin_info['treaty']) {
             $platform_with_hold['exer'] = 'user.p.' . $platform . '.token';
             $platform_with_hold['tokensymbol'] = $coin_name;
-            $platform_with_hold['fee'] = 0;
-            $coins_model = Coin::find()->select('name')->where(['platform' => $platform, 'treaty' => 2])->asArray()->one();
-            $platform_with_hold['coins_name'] = empty($coins_model) ? '' : $coins_model['name'];
         } else {
             $platform_with_hold['exer'] = 'user.p.' . $platform . '.coins';
             $platform_with_hold['tokensymbol'] = $platform . '.coins';
-            $platform_with_hold['fee'] = (float)sprintf("%0.4f", (double)$platform_with_hold['fee']);
-            $platform_with_hold['coins_name'] = '';
         }
+        $platform_with_hold['fee'] = (float)sprintf("%0.4f", (double)$platform_with_hold['fee']);
+        $coins_model = Coin::find()->select('name')->where(['platform' => $platform, 'treaty' => 2])->asArray()->one();
+        $platform_with_hold['coins_name'] = empty($coins_model) ? '' : $coins_model['name'];
         $service = new Chain33Business();
         $result = $service->getProperFee();
         if (0 === $result['code']) {