|
|
@@ -3412,7 +3412,7 @@ class BonusCalc extends BaseObject {
|
|
|
->asArray()
|
|
|
->all();
|
|
|
$userBS = is_array($userBS) ? reset($userBS) : [];
|
|
|
- $blueStartAmount = isset($userBS['AMOUNT']) && !empty($userBS['AMOUNT']) ? $userBS['AMOUNT'] : 0; // 奖金
|
|
|
+ // $blueStartAmount = isset($userBS['AMOUNT']) && !empty($userBS['AMOUNT']) ? $userBS['AMOUNT'] : 0; // 奖金
|
|
|
$buleStartOriBonus = isset($userBS['ORI_BONUS']) && !empty($userBS['ORI_BONUS']) ? $userBS['ORI_BONUS'] : 0; // 原奖金
|
|
|
// $buleStartManageTax = isset($userBS['MANAGE_TAX']) && !empty($userBS['MANAGE_TAX']) ? $userBS['MANAGE_TAX'] : 0; // 管理费
|
|
|
|
|
|
@@ -3422,6 +3422,7 @@ class BonusCalc extends BaseObject {
|
|
|
$blueBonusGLSF = isset($userBS['ORI_BONUS_BU_GLSF']) && !empty($userBS['ORI_BONUS_BU_GLSF']) ? $userBS['ORI_BONUS_BU_GLSF'] : 0; // 拆分管理奖 实发
|
|
|
$blueBonusYJSF = isset($userBS['ORI_BONUS_BU_YJSF']) && !empty($userBS['ORI_BONUS_BU_YJSF']) ? $userBS['ORI_BONUS_BU_YJSF'] : 0; // 拆分业绩奖 实发
|
|
|
|
|
|
+ $blueStartAmount = $blueBonusGLSF + $blueBonusYJSF; // 总实发，管理奖实发+业绩奖实发
|
|
|
$monthSumData = CalcBonus::findUseSlaves()
|
|
|
->select('SUM(BONUS_GX) AS BONUS_GX_SUM, SUM(BONUS_GL) AS BONUS_GL_SUM')
|
|
|
->where('USER_ID=:USER_ID AND CALC_MONTH=:CALC_MONTH',
|
|
|
@@ -3436,7 +3437,7 @@ class BonusCalc extends BaseObject {
|
|
|
$bonusGlSum = $monthSumData['BONUS_GL_SUM'] ?? 0;
|
|
|
$realBonusGx += $bonusGxSum + $bonus['BONUS_GX'];
|
|
|
$realBonusGl += $bonusGlSum + $bonus['BONUS_GL'];
|
|
|
- $realBonusBs = $blueStartAmount; // 蓝星奖直接取数据库中算好的值PRODUCT_POINT
|
|
|
+ $realBonusBs = $blueStartAmount;
|
|
|
$bonusReal += $realBonusGx + $realBonusBs + $realBonusGl;
|
|
|
$exchangePoints = isset($userBS['PRODUCT_POINT']) && !empty($userBS['PRODUCT_POINT']) ? $userBS['PRODUCT_POINT'] : 0; // 兑换积分
|
|
|
unset($monthSumData, $bonusGxSum, $bonusGlSum);
|
|
|
@@ -3446,7 +3447,9 @@ class BonusCalc extends BaseObject {
|
|
|
} else {
|
|
|
// 蓝星奖原奖金在扣管理费的时候被加入到了BONUS_TOTAL,需要再减去原奖金
|
|
|
$oriBonusBs = isset($bonus['ORI_BONUS_BS']) && $bonus['ORI_BONUS_BS'] > 0 ? $bonus['ORI_BONUS_BS'] : 0;
|
|
|
- $bonus['BONUS_TOTAL'] = $bonus['BONUS_TOTAL'] - $oriBonusBs;
|
|
|
+ $oriBonusBsYJCF = isset($bonus['ORI_BONUS_BU_YJ']) && $bonus['ORI_BONUS_BU_YJ'] > 0 ? $bonus['ORI_BONUS_BU_YJ'] : 0;
|
|
|
+ $oriBonusBsGLCF = isset($bonus['ORI_BONUS_BU_GL']) && $bonus['ORI_BONUS_BU_GL'] > 0 ? $bonus['ORI_BONUS_BU_GL'] : 0;
|
|
|
+ $bonus['BONUS_TOTAL'] = $bonus['BONUS_TOTAL'] - $oriBonusBs - $oriBonusBsYJCF - $oriBonusBsGLCF;
|
|
|
}
|
|
|
}
|
|
|
// if( $this->_isCalcMonth ) {
|
root