修改奖金计算的limit，季度奖发放条件

common/helpers/bonus/BonusCalc.php

@@ -65,7 +65,7 @@ use yii\db\Query;
 class BonusCalc extends BaseObject {
     use StaticInstanceTrait;
 
-    private $_limit = 1000;
+    private $_limit = 10000;
     private $_gxLimit = 500;
     private $_handleUserId;
     private $_companyMonthPerf = 0;
@@ -2030,8 +2030,8 @@ class BonusCalc extends BaseObject {
                 ->all();
         if ($allData){
             // 达标条件：会员级别：钻卡
-            $config = json_decode($this->_sysConfig['openGL']['OPTIONS'], true);
-            $minDecLevel = $config['mntDec'] ?? [];
+            $config = json_decode($this->_sysConfig['openQuarter']['OPTIONS'], true);
+            $minDecLevel = $config['declarationLevel'] ?? [];
 
             foreach ($allData as $user) {
                 // 扣除相应的复消积分和管理费
@@ -2040,14 +2040,14 @@ class BonusCalc extends BaseObject {
                 $manageTax = $deductData['manageTax']; // 管理费
                 $point = $deductData['reConsumePoints'] + $user['RECONSUME_POINTS'];// 复消积分
                 // 管理奖钻卡发放
-//                if (in_array($user['LAST_DEC_LV'], $minDecLevel)) {
-                // 把对碰后的奖金存入缓存中
-                CalcCache::bonus($user['USER_ID'], $this->_periodNum, 'BONUS_QUARTER', $user['ORI_BONUS'], $deductData);
-                // 加入月奖的会员
-                CalcCache::addHasMonthBonusUsers($user['USER_ID'], $this->_periodNum);
-//                }
+                if ($user['LAST_DEC_LV'] == $minDecLevel) {
+                    // 把对碰后的奖金存入缓存中
+                    CalcCache::bonus($user['USER_ID'], $this->_periodNum, 'BONUS_QUARTER', $user['ORI_BONUS'], $deductData);
+                    // 加入月奖的会员
+                    CalcCache::addHasMonthBonusUsers($user['USER_ID'], $this->_periodNum);
+                }
 
-                // 更新蓝星奖金存储过程的实发金额数据
+                // 更新奖金存储过程的实发金额数据
                 CalcBonusQuarter::updateAll([
                     'RECONSUME_POINTS' => $point,
                     'AMOUNT' => $realBonusBs,

common/helpers/bonus/CalcCache.php

@@ -33,7 +33,7 @@ use common\models\UserInfo;
 use yii\helpers\Json;
 
 class CalcCache {
-    const LIMIT = 1000;
+    const LIMIT = 10000;
 
     const REDIS_KEY_PREFIX_USER = 'calc:user_';
     const REDIS_KEY_PREFIX_USER_ACTIVE = 'calc:userActive_';

common/helpers/bonus/PerfCalc.php

@@ -42,7 +42,7 @@ use yii\base\StaticInstanceTrait;
 class PerfCalc {
     use StaticInstanceTrait;
 
-    private $_limit = 1000;
+    private $_limit = 10000;
     private $_handleUserId;
     private $_companyMonthPerf = 0;
     private $_cfTotalPercent = 0;