|
|
@@ -1225,9 +1225,12 @@ class BonusCalc extends BaseObject {
|
|
|
if ($touchBonusArr['touchBonus'] <= 0) continue;
|
|
|
|
|
|
$teamBonus = $touchBonusArr['touchBonus'];
|
|
|
+ $capBonusQy = $teamBonus; // 封顶前的奖金
|
|
|
//判断级别上限
|
|
|
$teamBonus = $this->declarationLevelCap($teamBonus, $userId, $userBaseInfo['DEC_LV']);
|
|
|
if( $teamBonus <= 0 ) continue;
|
|
|
+ // 将封顶前的金额加入用户奖金缓存中,此金额不能发放(总奖金,总实际奖金)
|
|
|
+ CalcCache::bonus($userId, $periodNum, 'CAPPED_BONUS_QY', $capBonusQy);
|
|
|
|
|
|
$teamBonus = $this->bonusTotalLimit($teamBonus, $userId, $userBaseInfo['REC_NUM'], $userBaseInfo['ZC_AMOUNT']);
|
|
|
if( $teamBonus <= 0 ) continue;
|
|
|
@@ -1242,6 +1245,7 @@ class BonusCalc extends BaseObject {
|
|
|
$insertBonusData[] = [
|
|
|
'ID' => SnowFake::instance()->generateId(),
|
|
|
'USER_ID' => $userId,
|
|
|
+ 'ORI_CAPPED_BONUS_QY' => $capBonusQy,
|
|
|
'LAST_DEC_LV' => $userBaseInfo['DEC_LV'],
|
|
|
'LAST_EMP_LV' => $userBaseInfo['EMP_LV'],
|
|
|
'LAST_STATUS' => $userBaseInfo['STATUS'],
|
|
|
@@ -3616,6 +3620,7 @@ class BonusCalc extends BaseObject {
|
|
|
'ORI_BONUS_YC' => $bonus['ORI_BONUS_YC'] + $bonus['ORI_BONUS_YC_EXTRA'],
|
|
|
'ORI_BONUS_VIP' => $bonus['ORI_BONUS_VIP'],
|
|
|
'ORI_BONUS_STANDARD' => $standardBonus,
|
|
|
+ 'ORI_CAPPED_BONUS_QY' => $bonus['ORI_CAPPED_BONUS_QY'], // 团队奖封顶前的奖金
|
|
|
|
|
|
'BONUS_TOURISM' => $tourismBonus, // 旅游奖
|
|
|
'BONUS_GARAGE' => $garageBonus, // 车房奖
|