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

+ 4 - 4
common/helpers/bonus/BonusCalc.php

@@ -1569,7 +1569,7 @@ class BonusCalc extends BaseObject {
                     CalcCache::bonus($bonusUserId, $this->_periodNum, 'BONUS_GX', $bonus);
                     CalcCache::addHasMonthBonusUsers($bonusUserId, $this->_periodNum);
 
-                    //共享奖流水
+                    //共享奖流水 rm1820 月总扣除复消积分和管理费,流水中不扣除.
                     $insertBonusData[] = [
                         'ID' => SnowFake::instance()->generateId(),
                         'USER_ID' => $bonusUserId,
@@ -1580,10 +1580,10 @@ class BonusCalc extends BaseObject {
                         'LAST_FROM_DEC_LV' => $userBaseInfo['DEC_LV'],
                         'LAST_FROM_EMP_LV' => $userEmpLevel,
                         'LAST_FROM_STATUS' => $userBaseInfo['STATUS'],
-                        'AMOUNT' => 0,
+                        // 'AMOUNT' => 0,
                         'ORI_BONUS' => $bonus,
-                        'RECONSUME_POINTS' => 0,
-                        'MANAGE_TAX' => 0,
+                        // 'RECONSUME_POINTS' => 0,
+                        // 'MANAGE_TAX' => 0,
                         'PERIOD_NUM' => $this->_periodNum,
                         'CALC_YEAR' => $this->_calcYear,
                         'CALC_MONTH' => $this->_calcYearMonth,

+ 1 - 1
common/helpers/bonus/BonusSend.php

@@ -317,7 +317,7 @@ class BonusSend extends BaseObject {
                             'BD' => $data['BONUS_BD'],
                             'TG' => $data['BONUS_TG'],
                             'YJ' => $data['BONUS_YJ'],
-                            'GX' => $data['BONUS_GX'],
+                            'GX' => $data['REAL_BONUS_GX'],
                             'GL' => $data['BONUS_GL'],
                             'BS' => $data['BONUS_BS'],