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

frontendApi/modules/v1/controllers/UserController.php

@@ -431,8 +431,9 @@ class UserController extends BaseController {
 
         $allGoods = ShopGoods::find()
             ->alias('S')
-            ->select('S.*,N.MARKET_PRICE,N.SELL_PRICE,N.TAX_RATE,N.LOCAL_CURRENCY_ID,N.COUNTRY_ID')
-            ->join('LEFT JOIN', ShopGoodsNature::tableName() . ' AS N', 'N.GOODS_ID=S.ID')
+            ->select('S.*,N.MARKET_PRICE,N.SELL_PRICE,N.TAX_RATE,N.LOCAL_CURRENCY_ID,N.COUNTRY_ID,C.CODE')
+            ->join('INNER JOIN', ShopGoodsNature::tableName() . ' AS N', 'N.GOODS_ID=S.ID')
+            ->join('INNER JOIN', Currency::tableName() . ' AS C', 'C.ID=N.LOCAL_CURRENCY_ID')
             ->where("STATUS=1 AND CATEGORY_TYPE=1 " . $query_condition, [':COUNTRY_ID' => $user['COUNTRY_ID']])
             ->orderBy('SORT ASC')
             ->asArray()
@@ -449,14 +450,18 @@ class UserController extends BaseController {
         // 升级会员汇率
         $country = Countries::getById($user['COUNTRY_ID']);
         $currencyRate = CurrencyConversions::getToUSDRate($country['LOCAL_CURRENCY_ID']);
+        // 升级会员币种
+        $currency = Currency::getById($country['LOCAL_CURRENCY_ID']);
 
         $userBalance = [
             'cash' => 0,
-            'localCash' => 0
+            'localCash' => 0,
+            'coin' => '',
         ];
         $userCash = UserWallet::findOneAsArray(['USER_ID' => \Yii::$app->user->id]);
         if ($userCash) {
             $userBalance['cash'] = $userCash['CASH'];
+            $userBalance['coin'] = $currency['CODE'] ?? '';
             $userBalance['localCash'] = Tool::convertAmount($userCash['CASH'], $decUserCurrencyRate, $currencyRate);
         }
 
@@ -624,7 +629,8 @@ class UserController extends BaseController {
         // 会员账户
         $userBalance = [
             'cash' => 0,
-            'localCash' => 0
+            'localCash' => 0,
+            'coin' => '',
         ];
         $userCash = UserWallet::findOneAsArray(['USER_ID' => \Yii::$app->user->id]);
         if ($userCash) {