Procházet zdrojové kódy

feat: UN-71: 会员-奖金列表调整

kevin před 1 rokem
rodič
revize
3d111303da

+ 3 - 4
common/models/EliteLevel.php

@@ -118,16 +118,15 @@ class EliteLevel extends \common\components\ActiveRecord
     public static function getFromCache()
     {
         $data = Yii::$app->cache->get(Cache::ELITE_LEVEL_CONFIG_KEY);
-        Yii::$app->cache->delete(Cache::ELITE_LEVEL_CONFIG_KEY);
         if(!$data){
             // 获取信息
             $data = self::getAllData();
             Yii::$app->cache->set(Cache::ELITE_LEVEL_CONFIG_KEY, $data);
         }
         // i18n转换
-        foreach ($data as &$item) {
-            $item['LEVEL_NAME'] = Yii::t('ctx', $item['LANGUAGE_KEY']);
-        }
+//        foreach ($data as &$item) {
+//            $item['LEVEL_NAME'] = Yii::t('ctx', $item['LANGUAGE_KEY']);
+//        }
         return $data;
     }
 

+ 2 - 1
frontendApi/modules/v1/controllers/BonusController.php

@@ -25,6 +25,7 @@ use common\models\CalcBonusFL;
 use common\models\Countries;
 use common\models\Currency;
 use common\models\DealType;
+use common\models\EliteLevel;
 use common\models\FlowBonus;
 use common\models\FlowCF;
 use common\models\FlowGaragePoints;
@@ -413,7 +414,7 @@ class BonusController extends BaseController {
             $result[$key]['PERIOD_NUM'] = ['name' => '期数', 'value' => $data['PERIOD_NUM']];
             $result[$key]['LAST_DEC_NAME'] = ['name' => '级别', 'value' => Cache::getDecLevelConfig()[$data['LAST_DEC_LV']]['LEVEL_NAME']];
             $result[$key]['LAST_EMP_NAME'] = ['name' => '聘级', 'value' => Cache::getEmpLevelConfig()[$data['LAST_EMP_LV']]['LEVEL_NAME']];
-            $result[$key]['LAST_ELITE_NAME'] = ['name' => 'Elite级别', 'value' => Cache::getEliteLevelConfig()[$data['LAST_ELITE_LV']]['LEVEL_NAME']];
+            $result[$key]['LAST_ELITE_NAME'] = ['name' => 'Elite级别', 'value' => Cache::getEliteLevelConfig()[($data['LAST_ELITE_LV'] ?: EliteLevel::getDefaultLevelId())]['LEVEL_NAME']];
 
             $result[$key]['BONUS_E'] = ['name' => 'Elite奖金', 'value' => Tool::formatPrice($data['BONUS_E'])];
             $result[$key]['BONUS_PE'] = ['name' => 'SuperElite奖金', 'value' => Tool::formatPrice($data['BONUS_PE'])];