feat: NG-27: Adjusting Service Award Settlement

common/helpers/bonus/CalcCache.php

@@ -557,7 +557,6 @@ class CalcCache {
     public static function getUserInfo($userId, $periodNum) {
         $key = self::REDIS_KEY_PREFIX_USER_INFO . $periodNum;
         $data = Yii::$app->redis->hget($key, $userId);
-        $data = [];
         if (empty($data)) {
             $userInfo = UserInfo::findUseDbCalc()
             ->select('USER_ID,USER_NAME,CON_UID,REC_UID')
@@ -567,6 +566,7 @@ class CalcCache {
             if( !$userInfo ) {
                 throw new \Exception('用户信息表数据不存在,userId:'.$userId);
             }
+
             $userShopInfo = User::find()
             ->select('LAST_DEC_LV,REAL_NAME,DEC_LV,EMP_LV,CROWN_LV,IS_DEC,STATUS,IS_STUDIO,DEC_ID,DEC_ROLE_ID,LAST_EMP_LV')
             ->where('ID=:ID', [':ID' => $userId])
@@ -575,7 +575,7 @@ class CalcCache {
             if ( !$userShopInfo ) {
                 throw new \Exception('用户表数据不存在,userId:'.$userId);
             }
-            //$bsEmpLv = Period::userLastEmpLv($userId, $periodNum);
+
             // 用户的最新蓝星级别,需要修改调整因为计算服务这里并没有以前的级别数据表数据,所以无法查询出以前的最近月节点数据
             // 获取用户的最新级别数据,根据蓝星最近一期月结数据进行查询
             $userInfo['REAL_NAME'] = $userShopInfo['REAL_NAME'];
@@ -587,7 +587,9 @@ class CalcCache {
             $userInfo['STATUS'] = $userShopInfo['STATUS'];
             $userInfo['DEC_ID'] = $userShopInfo['DEC_ID'];
             $userInfo['DEC_ROLE_ID'] = $userShopInfo['DEC_ROLE_ID'];
+
             unset($userShopInfo);
+
             if (!$userInfo['DEC_LV']) {
                 $userInfo['DEC_LV'] = DeclarationLevel::getDefaultLevelId();
             }
@@ -597,19 +599,15 @@ class CalcCache {
             if (!$userInfo['CROWN_LV']) {
                 $userInfo['CROWN_LV'] = StarCrownLevel::getDefaultLevelId();
             }
+
             $data = Json::encode($userInfo);
             Yii::$app->redis->hset($key, $userId, $data);
+
             unset($key, $userId, $periodNum);
+
             return $userInfo;
         } else {
-            if ($data) {
-                $ret = Json::decode($data, true);
-                //$bsEmpLv = Period::userLastEmpLv($userId, $periodNum);
-                // $ret['LAST_EMP_LV'] = EmployLevel::NO_LEVEL_ID; // 最新的聘级
-                return $ret;
-            } else {
-                return [];
-            }
+            return [];
         }
     }