Эх сурвалжийг харах

feat: NG-15: 新会员注册时增加国家与语言选项.

kevin 1 жил өмнө
parent
commit
a3df66b10c

+ 12 - 2
backendApi/modules/v1/controllers/CurrencyController.php

@@ -23,8 +23,18 @@ class CurrencyController extends BaseController
 
     public function actionCurrenciesConversions()
     {
-        $data = $this->currencyConversionsModelClass::getFromCache();
-        return static::notice(['data' => $data]);
+        // 货币列表
+        $currencies = $this->modelClass::getFromCache();
+        // 货币汇率配置
+        $currencyConversion = $this->currencyConversionsModelClass::getFromCache();
+        $currencyConversion = array_column($currencyConversion, NULL, 'TO_CURRENCY_ID');
+
+        foreach ($currencies as &$currency) {
+            $currency['PRODUCT_RATE'] = $currencyConversion[$currency['ID']]['PRODUCT_RATE'] ?? 0;
+            $currency['BONUSES_RATE'] = $currencyConversion[$currency['ID']]['BONUSES_RATE'] ?? 0;
+        }
+
+        return static::notice(['data' => $currencies]);
     }
 
     /**

+ 1 - 1
common/models/forms/CurrenciesConversionsForm.php

@@ -21,7 +21,7 @@ class CurrenciesConversionsForm extends Model
 {
     public $modelClass = CurrencyConversions::class;
 
-    public $from_currency_id;
+    public $from_currency_id = 149; // 美元USD
     public $to_currency_id;
     public $product_rate;
     public $bonuses_rate;