共享奖金,如果不是月节点，减去管理费.

common/helpers/bonus/BonusCalc.php

@@ -3325,10 +3325,12 @@ class BonusCalc extends BaseObject {
 
                 // 如果未满足,则复消积分,应该不能发放
                 $bonus['RECONSUME_POINTS'] = $bonus['RECONSUME_POINTS']- $bonus['GX_RECONSUME_POINTS'];
+                $bonus['MANAGE_TAX'] = $bonus['MANAGE_TAX'] - $bonus['GX_MANAGE_TAX'];
             }
         } else {
             // 非月节点,共享奖金不发放复消积分和奖金
             $bonus['RECONSUME_POINTS'] = $bonus['RECONSUME_POINTS']- $bonus['GX_RECONSUME_POINTS'];
+            $bonus['MANAGE_TAX'] = $bonus['MANAGE_TAX'] - $bonus['GX_MANAGE_TAX'];
         }
         // if( $this->_isCalcMonth ) {
         //     // 将查看是否复消300的逻辑,改成月结时判断当前月有一周活跃则本月活跃

common/helpers/bonus/CalcCache.php

@@ -1456,6 +1456,7 @@ class CalcCache {
             'BONUS_TOTAL' => 0,
             'RECONSUME_POINTS' => 0,
             'GX_RECONSUME_POINTS'=>0, // 共享奖复消积分,非月节点,不能发放,记录每期复消积分数据,发放的时候减去
+            'GX_MANAGE_TAX' =>0 ,
             'MANAGE_TAX' => 0,
 
             //没有用到的
@@ -1491,7 +1492,8 @@ class CalcCache {
                     $value['RECONSUME_POINTS'] += $deductData['reConsumePoints'];
                     $value['MANAGE_TAX'] += $deductData['manageTax'];
                     if ($isGx === true) {
-                        $value['GX_RECONSUME_POINTS'] = $deductData['reConsumePoints'];
+                        $value['GX_RECONSUME_POINTS'] += $deductData['reConsumePoints'];
+                        $value['GX_MANAGE_TAX'] += $deductData['manageTax'];
                     }
                 }else {
                     $value[$bonusType] += $oriBonus;