root пре 3 година
родитељ
комит
6f6d4376db
2 измењених фајлова са 4 додато и 21 уклоњено
  1. 4 21
      common/helpers/bonus/CalcServeBonusCalc.php
  2. 0 0
      common/models/DeductReconsume.php

+ 4 - 21
common/helpers/bonus/CalcServeBonusCalc.php

@@ -1290,7 +1290,7 @@ class CalcServeBonusCalc extends BaseObject {
         }
         // 总实发=总原奖金-扣除的总管理费-总复消积分
         $bonusReal = $bonus['BONUS_TOTAL'] - $deductManageTax - $deductReconsumePoints;
-
+        // NG系统,不发放兑换积分
         $result = [
             'USER_ID' => $userId,
             'LAST_USER_NAME' => $baseInfo['USER_NAME'],
@@ -1298,36 +1298,19 @@ class CalcServeBonusCalc extends BaseObject {
             'LAST_DEC_LV' => $baseInfo['DEC_LV'],
             'LAST_EMP_LV' => $baseInfo['LAST_EMP_LV'],
             'LAST_CROWN_LV' => $starCrownLv ?? StarCrownLevel::getDefaultLevelId(),
-            'LAST_STATUS' => $baseInfo['STATUS'],
-            'LAST_REC_USER_NAME' => $baseInfo['REC_USER_NAME'],
-            'LAST_REC_REAL_NAME' => $baseInfo['REC_REAL_NAME'],
-            'LAST_CON_USER_NAME' => $baseInfo['CON_USER_NAME'],
-            'LAST_CON_REAL_NAME' => $baseInfo['CON_REAL_NAME'],
-//            'LAST_LOCATION' => $baseInfo['LOCATION'] ? $baseInfo['LOCATION'] : 1,
-            //@todo
-            'LAST_LOCATION' => 1,
-            'BONUS_BD' => $bonus['BONUS_BD'],
-            'BONUS_TG' => $bonus['BONUS_TG'],
-            'BONUS_QY' => $bonus['BONUS_QY'],
             'RECONSUME_POINTS' => $deductReconsumePoints,
             'MANAGE_TAX' => $deductManageTax,    // 管理费
-            'BONUS_INCOME'=>$bonus['INCOME_TOTAL'],
             'BONUS_REAL'=>  $bonusReal,
             'BONUS_TOTAL'=>$bonus['BONUS_TOTAL'],
             'ORI_BONUS_BD' => $bonus['ORI_BONUS_BD'],
             'ORI_BONUS_TG' => $bonus['ORI_BONUS_TG'],
             'ORI_BONUS_BS' => $bonus['ORI_BONUS_BS'], // 蓝星管理奖金原奖金
-
             'ORI_BONUS_QY' => $bonus['ORI_BONUS_QY'],
             'ORI_CAPPED_BONUS_QY' => $bonus['ORI_CAPPED_BONUS_QY'], // 团队奖封顶前的奖金
-            'BONUS_QUARTER' => $bonus['BONUS_QUARTER'],
             'ORI_BONUS_QUARTER' => $bonus['ORI_BONUS_QUARTER'],
-
-            'BONUS_TOURISM' => $tourismBonus, // 旅游奖
-            'BONUS_VILLA' => $villaBonus, // 房奖
-            'BONUS_GARAGE' => $garageBonus, // 车奖
-
-            //以下没有用
+            'ORI_BONUS_TOURISM' => $tourismBonus, // 旅游奖
+            'ORI_BONUS_VILLA' => $villaBonus, // 房奖
+            'ORI_BONUS_GARAGE' => $garageBonus, // 车奖
             'PV_1L' => $perfData['PV_1L_TOUCH'],//TOUCH为碰业绩
             'QY_1L' => $perfData['PV_1L_TOUCH'] + $pervSurplusPerf['SURPLUS_1L'],
             'SURPLUS_1L' => $perfData['SURPLUS_1L'],

+ 0 - 0
common/models/DeductReconsume.php