root 3 лет назад
Родитель
Сommit
bf417e1226
2 измененных файлов с 5 добавлено и 1 удалено
  1. 3 1
      common/helpers/bonus/BonusCalc.php
  2. 2 0
      common/helpers/bonus/CalcCache.php

+ 3 - 1
common/helpers/bonus/BonusCalc.php

@@ -3615,7 +3615,7 @@ class BonusCalc extends BaseObject {
                 $bonus['MANAGE_TAX'] = $bonus['MANAGE_TAX'] + $monthGxManageTax;
                 $realBonusGl += $bonusGlSum + $bonus['BONUS_GL'];
                 $realBonusBs = $blueStartAmount;
-                $bonusReal += $realBonusGx + $realBonusBs + $realBonusGl;
+                $bonusReal += $realBonusGx + $realBonusBs + $realBonusGl + $bonus['BONUS_STORE']; // 再加上店服务奖的实发
                 $exchangePoints = isset($userBS['PRODUCT_POINT']) && !empty($userBS['PRODUCT_POINT']) ? $userBS['PRODUCT_POINT'] : 0; // 兑换积分
                 unset($monthSumData, $bonusGxSum, $bonusGlSum);
                 $oriBonusBs = isset($bonus['ORI_BONUS_BS']) && $bonus['ORI_BONUS_BS'] > 0 ? $bonus['ORI_BONUS_BS'] : 0;
@@ -3694,6 +3694,8 @@ 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,
+            'BONUS_ST' => $bonus['BONUS_STORE'], // 店服务奖实发
+            'ORI_BONUS_ST' => $bonus['ORI_BONUS_STORE'], // 店服务奖原奖金
 
 
 

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

@@ -1467,6 +1467,7 @@ class CalcCache {
             'BONUS_YC' => 0,
             'BONUS_VIP' => 0,
             'BONUS_BS' => 0,
+            'BONUS_STORE' => 0, // 店服务奖实发
 
             'BONUS_BU_GL'=>0,  //蓝星管理奖实发
             'BONUS_BU_YJ'=>0,  // 蓝星业绩奖实发
@@ -1477,6 +1478,7 @@ class CalcCache {
 
 
             'BONUS_YC_EXTRA' => 0,
+            'ORI_BONUS_STORE' => 0, // 店服务奖原奖金
             'ORI_BONUS_BD' => 0,
             'ORI_BONUS_BS' => 0,
             'ORI_BONUS_TG' => 0,