فهرست منبع

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

kevin 1 سال پیش
والد
کامیت
1a9f7b7b90
2فایلهای تغییر یافته به همراه7 افزوده شده و 2 حذف شده
  1. 5 0
      backendApi/modules/v1/controllers/SiteController.php
  2. 2 2
      common/models/forms/ShopGoodsForm.php

+ 5 - 0
backendApi/modules/v1/controllers/SiteController.php

@@ -9,6 +9,7 @@ namespace backendApi\modules\v1\controllers;
 
 use common\helpers\snowflake\PageSnowFake;
 use common\helpers\Tool;
+use common\models\CurrencyConversions;
 use common\models\DealType;
 use common\models\Period;
 use common\models\RegType;
@@ -184,9 +185,13 @@ class SiteController extends BaseController
         // 货币
         $currencies = Cache::getCurrencies();
         $currencies = array_column($currencies, NULL, 'ID');
+        // 货币汇率
+        $currenciesConversions = CurrencyConversions::getFromCache();
+        $currenciesConversions = array_column($currenciesConversions, NULL, 'TO_CURRENCY_ID');
 
         foreach ($countries as &$country) {
             $country['LOCAL_CURRENCY_NAME'] = $currencies[$country['LOCAL_CURRENCY_ID']]['NAME'] ?? '';
+            $country['CURRENCY_PRODUCT_RATE'] = $currenciesConversions[$country['LOCAL_CURRENCY_ID']]['PRODUCT_RATE'] ?? 0;
         }
 
         return static::notice(['data' => $countries]);

+ 2 - 2
common/models/forms/ShopGoodsForm.php

@@ -212,14 +212,14 @@ class ShopGoodsForm extends Model
                 // 国家
                 $currency = Countries::getById($item['countryId']);
                 // 转换美元汇率
-                $rate = CurrencyConversions::getToUSDRate($currency['LOCAL_CURRENCY_ID']);
+                $productRate = CurrencyConversions::getToUSDRate($currency['LOCAL_CURRENCY_ID']);
 
                 $shopGoodsNature = new ShopGoodsNature();
                 $shopGoodsNature->GOODS_ID = $shopGoods->ID;
                 $shopGoodsNature->COUNTRY_ID = $item['countryId'];
                 $shopGoodsNature->LOCAL_CURRENCY_ID = $currency['LOCAL_CURRENCY_ID'];
                 $shopGoodsNature->MARKET_PRICE = $item['sellPrice'];
-                $shopGoodsNature->SELL_PRICE = $shopGoods->SELL_PRICE_STANDARD * $rate;
+                $shopGoodsNature->SELL_PRICE = $shopGoods->SELL_PRICE_STANDARD * $productRate;
                 $shopGoodsNature->TAX_RATE = $item['taxRate'];
                 if (!$shopGoodsNature->save()) {
                     $transaction->rollBack();