管理奖计算级别限制修改

common/helpers/bonus/BonusCalc.php

@@ -1835,6 +1835,11 @@ class BonusCalc extends BaseObject {
                 continue;
             }
 
+            // 会员级别达到要求才会发放奖金
+            if ($item['LAST_DEC_LV'] != $minDecLevel) {
+                continue;
+            }
+
             $insertBonusData[] = [
                 'ID' => SnowFake::instance()->generateId(),
                 'USER_ID' => $item['USER_ID'],
@@ -1873,17 +1878,14 @@ class BonusCalc extends BaseObject {
                 // 奖金数不能大于封顶值
                 $amount = ($amount > $capBonus) ? $capBonus : $amount;
 
-                // 会员级别达到要求才会发放奖金
-                if ($bonusData['LAST_DEC_LV'] == $minDecLevel) {
-                    // 放入缓存
-                    CalcCache::villaBonus($bonusData['USER_ID'], $this->_periodNum, $amount);
-                    // 加入月奖的会员
-                    CalcCache::addHasMonthBonusUsers($bonusData['USER_ID'], $this->_periodNum);
-                }
-
                 $bonusData['AMOUNT'] = $amount;
                 $bonusData['CAP_AMOUNT'] = $capAmount;
                 $bonusData['POINT_COMPLEX'] = $bonusPointComplex;
+
+                // 放入缓存
+                CalcCache::villaBonus($bonusData['USER_ID'], $this->_periodNum, $amount);
+                // 加入月奖的会员
+                CalcCache::addHasMonthBonusUsers($bonusData['USER_ID'], $this->_periodNum);
             }
 
             CalcBonusVilla::batchInsert($insertBonusData);
@@ -1955,6 +1957,10 @@ class BonusCalc extends BaseObject {
             if ($bonusPoint <= 0) {
                 continue;
             }
+            // 会员级别达到要求才会发放奖金
+            if ($bonusData['LAST_DEC_LV'] != $minDecLevel) {
+                continue;
+            }
 
             $insertBonusData[] = [
                 'ID' => SnowFake::instance()->generateId(),
@@ -1993,17 +1999,14 @@ class BonusCalc extends BaseObject {
                 // 奖金数不能大于封顶值
                 $amount = ($amount > $capBonus) ? $capBonus : $amount;
 
-                // 会员级别达到要求才会发放奖金
-                if ($bonusData['LAST_DEC_LV'] == $minDecLevel) {
-                    // 放入缓存
-                    CalcCache::garageBonus($bonusData['USER_ID'], $this->_periodNum, $amount);
-                    // 加入月奖的会员
-                    CalcCache::addHasMonthBonusUsers($bonusData['USER_ID'], $this->_periodNum);
-                }
-
                 $bonusData['AMOUNT'] = $amount;
                 $bonusData['CAP_AMOUNT'] = $capAmount;
                 $bonusData['POINT_COMPLEX'] = $bonusPointComplex;
+
+                // 放入缓存
+                CalcCache::garageBonus($bonusData['USER_ID'], $this->_periodNum, $amount);
+                // 加入月奖的会员
+                CalcCache::addHasMonthBonusUsers($bonusData['USER_ID'], $this->_periodNum);
             }
 
             CalcBonusGarage::batchInsert($insertBonusData);