Explorar o código

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

kevin hai 1 ano
pai
achega
535599a471

+ 0 - 1
backendApi/modules/v1/controllers/BonusController.php

@@ -2073,7 +2073,6 @@ class BonusController extends BaseController {
             'REAL_NAME' => 'UI.REAL_NAME',
             'userIds' => 'UB.USER_ID',
             'IS_DEC' => 'UI.IS_DEC',
-            'PERIOD_AT' => 'UI.PERIOD_AT',
         ]);
         $condition = $filter['condition'];
         $params = $filter['params'];

+ 6 - 3
backendApi/modules/v1/models/lists/bonus/PeriodBonusList.php

@@ -6,6 +6,9 @@ use common\helpers\Tool;
 use common\helpers\user\Info;
 use common\libs\dataList\DataListInterface;
 use common\models\CalcBonus;
+use common\models\DeclarationLevel;
+use common\models\EliteLevel;
+use common\models\EmployLevel;
 use common\models\Period;
 use common\models\UserInfo;
 use Yii;
@@ -42,9 +45,9 @@ class PeriodBonusList extends \common\libs\dataList\DataList implements DataList
 
         if ($this->listData['list']) {
             foreach ($this->listData['list'] as $key => $value) {
-                $this->listData['list'][$key]['LAST_DEC_LV_NAME'] = Cache::getDecLevelConfig()[$value['LAST_DEC_LV']]['LEVEL_NAME'];
-                $this->listData['list'][$key]['LAST_EMP_LV_NAME'] = Cache::getEmpLevelConfig()[$value['LAST_EMP_LV']]['LEVEL_NAME'];
-                $this->listData['list'][$key]['LAST_ELITE_LV_NAME'] = Cache::getEliteLevelConfig()[$value['LAST_ELITE_LV']]['LEVEL_NAME'];
+                $this->listData['list'][$key]['LAST_DEC_LV_NAME'] = Cache::getDecLevelConfig()[$value['LAST_DEC_LV']]['LEVEL_NAME'] ?? Cache::getDecLevelConfig()[DeclarationLevel::getDefaultLevelId()]['LEVEL_NAME'];
+                $this->listData['list'][$key]['LAST_EMP_LV_NAME'] = Cache::getEmpLevelConfig()[$value['LAST_EMP_LV']]['LEVEL_NAME'] ?? Cache::getEmpLevelConfig()[EmployLevel::getDefaultLevelId()]['LEVEL_NAME'];
+                $this->listData['list'][$key]['LAST_ELITE_LV_NAME'] = Cache::getEliteLevelConfig()[$value['LAST_ELITE_LV']]['LEVEL_NAME'] ?? Cache::getEliteLevelConfig()[EliteLevel::getDefaultLevelId()]['LEVEL_NAME'];
                 $this->listData['list'][$key]['LAST_STATUS_NAME'] = Tool::paramConvert(Yii::$app->params['userStatus'])[$value['LAST_STATUS']]['label'];
                 $this->listData['list'][$key]['LAST_REC_USER_NAME'] = Info::getUserNameByUserId($value['REC_UID']);
                 $this->listData['list'][$key]['LAST_REC_REAL_NAME'] = Info::getUserRealNameByUserId($value['REC_UID']);