|
|
@@ -448,7 +448,7 @@ class BonusController extends BaseController {
|
|
|
//获取可以查看几期奖金
|
|
|
$showBonusPeriodNum = Cache::getSystemConfig()['showBonusPeriodNum']['VALUE'];
|
|
|
$calcBonus = CalcBonus::find()->where('USER_ID=:USER_ID AND IS_SENT=1', [':USER_ID' => \Yii::$app->user->id])
|
|
|
- ->select('PERIOD_NUM,ORI_BONUS_QY,ORI_BONUS_YC,ORI_BONUS_VIP,ORI_BONUS_STANDARD,ORI_BONUS_BD,ORI_BONUS_TG,
|
|
|
+ ->select('USER_ID,PERIOD_NUM,ORI_BONUS_QY,ORI_BONUS_YC,ORI_BONUS_VIP,ORI_BONUS_STANDARD,ORI_BONUS_BD,ORI_BONUS_TG,
|
|
|
ORI_BONUS_XF,BONUS_TOTAL,MANAGE_TAX,BONUS_REAL,BONUS_INCOME,ORI_BONUS_YJ,ORI_BONUS_GX,ORI_BONUS_GL,RECONSUME_POINTS,
|
|
|
LAST_DEC_LV,LAST_EMP_LV,EXCHANGE_POINTS,ORI_BONUS_BS,ORI_BONUS_BU_GL,ORI_BONUS_BU_YJ')
|
|
|
->limit($showBonusPeriodNum)
|
|
|
@@ -491,6 +491,15 @@ class BonusController extends BaseController {
|
|
|
if ($sysConfig['openFW']['VALUE']) {
|
|
|
$calcBonus[$key]['BONUS_BD'] = ['name' => '服务奖金', 'value' => Tool::formatPrice($calcBonus[$key]['ORI_BONUS_BD'])];
|
|
|
}
|
|
|
+
|
|
|
+ // 2022/06/28 特殊需求,如果user_id为670B84FD7C216D4EE055736AECE8644D齐长青,则将服务奖加到团队奖里面去,然后服务奖显示为0
|
|
|
+ if ($data['USER_ID'] == '670B84FD7C216D4EE055736AECE8644D') {
|
|
|
+ $calcBonus[$key]['BONUS_BD'] = ['name' => '服务奖金', 'value' => 0];
|
|
|
+ $calcBonus[$key]['BONUS_QY'] = [
|
|
|
+ 'name' => '绩效奖金',
|
|
|
+ 'value' => Tool::formatPrice($calcBonus[$key]['ORI_BONUS_QY']+$calcBonus[$key]['ORI_BONUS_BD'])
|
|
|
+ ];
|
|
|
+ }
|
|
|
// 总奖金
|
|
|
$calcBonus[$key]['BONUS_TOTAL'] = ['name' => '总奖金', 'value' => Tool::formatPrice($calcBonus[$key]['BONUS_TOTAL'])];
|
|
|
$calcBonus[$key]['RECONSUME_POINTS'] = ['name' => '复销点数', 'value' => Tool::formatPrice($calcBonus[$key]['RECONSUME_POINTS'])];
|