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

common/models/forms/DeclarationUpgradeForm.php

@@ -143,12 +143,14 @@ class DeclarationUpgradeForm extends Model
             }
 
             // 报单中心汇率
-            $decCountry = User::getEnCodeInfo(\Yii::$app->user->id)['COUNTRY_ID'];
+            $decCountryId = User::getEnCodeInfo(\Yii::$app->user->id)['COUNTRY_ID'];
+            $decCountry = Countries::getById($decCountryId);
             $decUserCurrencyRate = CurrencyConversions::getToUSDRate($decCountry['LOCAL_CURRENCY_ID']);
             // 升级会员汇率
-            $country = Countries::getById($baseInfo['COUNTRY_ID']);
+            $country = Countries::getById($this->countryId);
             $currencyRate = CurrencyConversions::getToUSDRate($country['LOCAL_CURRENCY_ID']);
 
+
             if($this->decWay==1) {
                 // 先不加套餐升级方式
                 // $decPackage = DeclarationPackage::findOneAsArray('ID=:ID', [':ID'=>$this->packageId]);