Преглед изворни кода

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

zhangl пре 1 година
родитељ
комит
9d8504280e

+ 14 - 3
common/models/DeclarationLevel.php

@@ -31,7 +31,7 @@ use Yii;
  */
 class DeclarationLevel extends \common\components\ActiveRecord
 {
-    const YIN_ZUAN_LEVEL_ID = '67ABCB8C1F7D5519E055736AECE8644D';
+    const YIN_ZUAN_LEVEL_ID = '67ABCCE20A9F5553E055736AECE8677A'; //'67ABCB8C1F7D5519E055736AECE8644D';
     const JIN_ZUAN_LEVEL_ID = '67ABCCE20A9F5553E055736AECE8644D';
     const VIP_LEVEL_ID      = '67ABCE0ECE705575E055736AECE8644D';
 
@@ -157,11 +157,22 @@ class DeclarationLevel extends \common\components\ActiveRecord
      * @return array|\yii\db\ActiveRecord[]
      */
     public static function getAllData(){
-        return static::find()->where('1=1')->indexBy('ID')->orderBy('SORT ASC')->asArray()->all();
+        $records = static::find()->where('1=1')->indexBy('ID')->orderBy('SORT ASC')->asArray()->all();
+        foreach ($records as &$record) {
+            $record['LEVEL_NAME'] = Yii::t('ctx', $record['LANGUAGE_KEY']);
+        }
+
+        return $records;
     }
 
     public static function getData(){
-        return static::find()->where('STATUS=1')->orderBy('SORT ASC')->asArray()->all();
+        $records = static::find()->where('STATUS=1')->orderBy('SORT ASC')->asArray()->all();
+
+        foreach ($records as &$record) {
+            $record['LEVEL_NAME'] = Yii::t('ctx', $record['LANGUAGE_KEY']);
+        }
+
+        return $records;
     }
 
     public static function getNextDecLv($decLvID)

+ 1 - 1
frontendApi/modules/v1/controllers/UserController.php

@@ -705,7 +705,7 @@ SQL;
             'decUserCurrencyRate' => $decUserCurrencyRate,
             'userCurrencyRate' => $currencyRate,
             'region' => $region,
-            'decLevel' => DeclarationLevel::getData()
+            'decLevel' => DeclarationLevel::getData(),
         ]);
     }