cache

common/helpers/Cache.php

@@ -32,13 +32,6 @@ class Cache
     const DEC_ROLE_CONFIG_KEY = 'sys:decRole';
     const EMP_LEVEL_CONFIG_KEY = 'sys:empLevel';
     const CROWN_LEVEL_CONFIG_KEY = 'sys:crownLevel';
-    const ADMIN_ROLE_KEY = 'sys:adminRole';
-    const SMS_TEMPLATE_DEC_KEY = 'sys:smsTemplateDec';
-    const SMS_TEMPLATE_EMP_KEY = 'sys:smsTemplateEmp';
-    const WITHDRAW_LEVEL_CONFIG_KEY = 'sys:withdrawLevel';
-    const OCR_API_CONFIG_KEY = 'sys:ocrApi';
-    const SMS_API_CONFIG_KEY = 'sys:smsApi';
-    const REGION_CONFIG_KEY = 'sys:region';
 
     const ASYNC_KEY_PREFIX = 'async_';
     const SOCKET_KEY_PREFIX = 'socket_';
@@ -155,23 +148,6 @@ class Cache
         return StarCrownLevel::getFromCache();
     }
 
-    /**
-     *  更新管理员角色
-     * @return array|\yii\db\ActiveRecord[]
-     */
-    public static function updateAdminRole(){
-        return AdminRole::updateToCache();
-    }
-
-
-    /**
-     * 获取管理员角色
-     * @return array|mixed|\yii\db\ActiveRecord[]
-     */
-    public static function getAdminRole(){
-        return AdminRole::getFromCache();
-    }
-
     /**
      *  更新聘级
      * @return array|\yii\db\ActiveRecord[]
@@ -245,30 +221,6 @@ class Cache
         return $prefix.$key;
     }
 
-    /**
-     * 获取提现等级
-     * @return array|mixed|\yii\db\ActiveRecord[]
-     */
-    public static function getWithdrawLevel(){
-        return WithdrawLevel::getFromCache();
-    }
-
-    /**
-     * 获取报单级别
-     * @return array|mixed|\yii\db\ActiveRecord[]
-     */
-    public static function getOcrApiConfig(){
-        return OcrApi::getFromCache();
-    }
-
-    /**
-     *  更新报单级别
-     * @return array|\yii\db\ActiveRecord[]
-     */
-    public static function updateOcrApiConfig(){
-        return OcrApi::updateToCache();
-    }
-
     /**
      * 获取全部安置网络上级
      * @param $userId
@@ -286,5 +238,4 @@ class Cache
     public static function getAllRelationParents($userId){
         return UserRelation::getAllParentsFromRedis($userId);
     }
-
 }

common/helpers/bonus/CalcCache.php

@@ -106,6 +106,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);
     }
 
     /**
@@ -154,6 +159,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);
     }
 
     /**

common/helpers/bonus/CalcServeBonusCalc.php

@@ -143,7 +143,7 @@ class CalcServeBonusCalc extends BaseObject {
             echo('初始化、清空缓存及相关数据表完成，耗时：' . round($t4 - $t1, 3) . ',内存使用：' . (round(memory_get_usage() / 1024 / 1024, 3)) . 'MB' . PHP_EOL);
             $this->_updatePercent(10);
             // 蓝星奖放到最前面 奖金计算开始
-            if($this->_sysConfig['openBS']['VALUE']) {
+            if($this->_sysConfig['openGL']['VALUE']) {
                 echo('计算蓝星奖开始，' . date('Y-m-d H:i:s', $t4) . PHP_EOL);
                 // 调用存储过程,计算蓝星管理奖金
                 $this->calcBsProcedure();
@@ -154,7 +154,7 @@ class CalcServeBonusCalc extends BaseObject {
                 }
             }
             $t5 = microtime(true);
-            echo('计算蓝星奖'.($this->_sysConfig['openBS']['VALUE']?'完成':'关闭').'，耗时：' . round($t5 - $t4, 3) . ',内存使用：' . (round(memory_get_usage() / 1024 / 1024, 3)) . 'MB' . PHP_EOL);
+            echo('计算蓝星奖'.($this->_sysConfig['openGL']['VALUE']?'完成':'关闭').'，耗时：' . round($t5 - $t4, 3) . ',内存使用：' . (round(memory_get_usage() / 1024 / 1024, 3)) . 'MB' . PHP_EOL);
 
             if($this->_sysConfig['openFW']['VALUE']) {
                 $this->calcBonusBDStepOne();
@@ -596,6 +596,7 @@ class CalcServeBonusCalc extends BaseObject {
                     'LAST_EMP_LV' => $userBaseInfo['LAST_EMP_LV'],
                     'LAST_CROWN_LV' => $lastCrownLv,
                     'LAST_STATUS' => $userBaseInfo['STATUS'],
+                    'AMOUNT' => $oriBonus,
                     'ORI_BONUS' => $oriBonus,
                     'PERIOD_NUM' => $this->_periodNum,
                     'CALC_YEAR' => $this->_calcYear,