Bladeren bron

更新缓存

root 3 jaren geleden
bovenliggende
commit
d913721b43
3 gewijzigde bestanden met toevoegingen van 15 en 12 verwijderingen
  1. 11 10
      common/helpers/bonus/CalcCache.php
  2. 2 0
      common/helpers/bonus/CalcServeBonusCalc.php
  3. 2 2
      common/models/EmployLevel.php

+ 11 - 10
common/helpers/bonus/CalcCache.php

@@ -8,6 +8,7 @@
 namespace common\helpers\bonus;
 
 use common\helpers\Cache;
+use common\models\Config;
 use common\models\PerfMonth;
 use common\models\Period;
 use common\models\DeclarationLevel;
@@ -106,11 +107,11 @@ class CalcCache {
         Yii::$app->redis->del(self::REDIS_KEY_PREFIX_HAS_MONTH_BONUS_USER_POOL . $periodNum);
         Yii::$app->redis->del(self::REDIS_KEY_PREFIX_FW_BONUS_LIST_DATA . $periodNum);
         Yii::$app->redis->del(self::REDIS_KEY_PREFIX_BONUS_CROWN_CROWN_LIST_DATA . $periodNum);
-        Yii::$app->redis->del(Cache::SYSTEM_CONFIG_KEY);
-        Yii::$app->redis->del(Cache::DEC_LEVEL_CONFIG_KEY);
-        Yii::$app->redis->del(Cache::DEC_ROLE_CONFIG_KEY);
-        Yii::$app->redis->del(Cache::EMP_LEVEL_CONFIG_KEY);
-        Yii::$app->redis->del(Cache::CROWN_LEVEL_CONFIG_KEY);
+        DeclarationLevel::updateToCache();
+        Config::updateToCache();
+        DecRole::updateToCache();
+        EmployLevel::updateToCache();
+        StarCrownLevel::updateToCache();
     }
 
     /**
@@ -159,11 +160,11 @@ class CalcCache {
         Yii::$app->redis->del(self::REDIS_KEY_PREFIX_USER_INFO_CHILD_ONE_DEEP . $periodNum);
         Yii::$app->redis->del(self::REDIS_KEY_PREFIX_FW_BONUS_LIST_DATA . $periodNum);
         Yii::$app->redis->del(self::REDIS_KEY_PREFIX_BONUS_CROWN_CROWN_LIST_DATA . $periodNum);
-        Yii::$app->redis->del(Cache::SYSTEM_CONFIG_KEY);
-        Yii::$app->redis->del(Cache::DEC_LEVEL_CONFIG_KEY);
-        Yii::$app->redis->del(Cache::DEC_ROLE_CONFIG_KEY);
-        Yii::$app->redis->del(Cache::EMP_LEVEL_CONFIG_KEY);
-        Yii::$app->redis->del(Cache::CROWN_LEVEL_CONFIG_KEY);
+        DeclarationLevel::updateToCache();
+        Config::updateToCache();
+        DecRole::updateToCache();
+        EmployLevel::updateToCache();
+        StarCrownLevel::updateToCache();
     }
 
     /**

+ 2 - 0
common/helpers/bonus/CalcServeBonusCalc.php

@@ -22,6 +22,7 @@ use common\models\CalcBonusTG;
 use common\models\CalcBonusTourism;
 use common\models\CalcBonusVilla;
 use common\models\Config;
+use common\models\DeclarationLevel;
 use common\models\EmployLevel;
 use common\models\PerfMonth;
 use common\models\PerfPeriod;
@@ -29,6 +30,7 @@ use common\models\Period;
 use common\models\ServeProcess;
 use common\models\StarCrownLevel;
 use Exception;
+use Yii;
 use yii\base\BaseObject;
 use yii\base\StaticInstanceTrait;
 use yii\db\Query;

+ 2 - 2
common/models/EmployLevel.php

@@ -160,7 +160,7 @@ class EmployLevel extends \common\components\ActiveRecord
      * @return array|\yii\db\ActiveRecord[]
      */
     public static function getAllData(){
-        $allData = static::find()->where('1=1')->orderBy('LEVEL_SORT ASC, CREATED_AT ASC')->indexBy('ID')->asArray()->all();
+        $allData = static::find()->where('1=1')->orderBy('SORT ASC, CREATED_AT ASC')->indexBy('ID')->asArray()->all();
         
         return $allData;
     }
@@ -170,7 +170,7 @@ class EmployLevel extends \common\components\ActiveRecord
         $ret = [];
         $allData = static::find()->where('1=1')->orderBy('SORT ASC, CREATED_AT ASC')->indexBy('ID')->asArray()->all();
         foreach($allData as $data) {
-            $ret[$data['ID']] = $data['LEVEL_SORT'];
+            $ret[$data['ID']] = $data['SORT'];
         }
         return $ret;
     }