solve conflict

api/controllers/CoinController.php

@@ -160,11 +160,13 @@ class CoinController extends BaseController
                             $value['high'] = $coin_quotations[$temp_key]['high'];
                             $value['last'] = $coin_quotations[$temp_key]['last'];
                             $value['rmb']  = $coin_quotations[$temp_key]['rmb'];
+                            $value['usd']  = $coin_quotations[$temp_key]['usd'] ?? 0;
                         } else {
                             $value['low']  = 0;
                             $value['high'] = 0;
                             $value['last'] = 0;
                             $value['rmb']  = 0;
+                            $value['usd']  = 0;
                         }
                     }
                     $value['id']              = $value['cid'];

common/business/ExchangeBusiness.php

@@ -59,7 +59,7 @@ class ExchangeBusiness
             $quotation['low'] = 1.00;
             $quotation['high'] = 1.00;
             $quotation['last'] = (float)sprintf("%0.4f", $quotation['rmb']/$rate);
-            return $quotation;
+            goto doEnd;
         }
         if(strtoupper($tag) == 'BOSS'){
             $quotation = [
@@ -68,7 +68,7 @@ class ExchangeBusiness
                 'last' => 2000,
                 'rmb' => 2000,
             ];
-            return $quotation;
+            goto doEnd;
         }
 
         if(strtoupper($tag) == 'CPF'){
@@ -78,7 +78,7 @@ class ExchangeBusiness
                 'last' => 3.4,
                 'rmb' => 3.4,
             ];
-            return $quotation;
+            goto doEnd;
         }
 
         if(in_array($tag,$coin_quotation_disable_items)){
@@ -91,42 +91,42 @@ class ExchangeBusiness
             $exchange = ExchangeFactory::createExchange("Token7");
             $quotation = $exchange->getTicker($tag, 'HA');
             $quotation['rmb'] = (float)sprintf("%0.2f", $quotation['last']);
-            return $quotation;
+            goto doEnd;
         }
 
         if(in_array(strtoupper($tag),['BECC'])){
             $exchange = ExchangeFactory::createExchange("S");
             $quotation = $exchange->getTicker($tag, 'ST');
             $quotation['rmb'] = (float)sprintf("%0.2f", $quotation['last']);
-            return $quotation;
+            goto doEnd;
         }
 
         if(in_array(strtoupper($tag),['GHP'])){
             $exchange = ExchangeFactory::createExchange("Zg");
             $quotation = $exchange->getTicker($tag, 'CNZ');
             $quotation['rmb'] = (float)sprintf("%0.2f", $quotation['last']);
-            return $quotation;
+            goto doEnd;
         }
 
         if(in_array(strtoupper($tag),['SFT'])){
             $exchange = ExchangeFactory::createExchange("Zhaobi");
             $quotation = $exchange->getTicker($tag, 'CNY');
             $quotation['rmb'] = (float)sprintf("%0.2f", $quotation['last']);
-            return $quotation;
+            goto doEnd;
         }
 
         if(in_array(strtoupper($tag),['CTG'])){
             $exchange = ExchangeFactory::createExchange("Gdpro");
             $quotation = $exchange->getTicker($tag, 'CNY');
             $quotation['rmb'] = (float)sprintf("%0.2f", $quotation['last']);
-            return $quotation;
+            goto doEnd;
         }
 
         if(in_array(strtoupper($tag),['USDT'])){
             $exchange = ExchangeFactory::createExchange("Go");
             $quotation = $exchange->getTicker('CNY', 'USD');
             $quotation['rmb'] = (float)sprintf("%0.2f", $quotation['last']);
-            return $quotation;
+            goto doEnd;
         }
 
         foreach (self::$exchanges as $exchange) {
@@ -182,6 +182,11 @@ class ExchangeBusiness
         }
         $quotation['rmb'] = (float)sprintf("%0.4f", $rate * $quotation['last']);
 
+        doEnd :
+        $exchange         = ExchangeFactory::createExchange("Go");
+        $rate             = $exchange->getTicker("CNY", "USD");
+        $cny_usd_rate     = 1 / $rate['last'];
+        $quotation['usd'] = (float)sprintf("%0.4f", $quotation['rmb'] * $cny_usd_rate);
         return $quotation;
     }
 
@@ -253,6 +258,7 @@ class ExchangeBusiness
                         $rows[$key]['last'] = 0;
                         $rows[$key]['low']  = 0;
                         $rows[$key]['high'] = 0;
+                        $rows[$key]['usd'] = 0;
                     }
                 }
                 if (strtoupper($row['platform']) == 'GUODUN') {