|
|
@@ -314,7 +314,7 @@ class BonusController extends BaseController {
|
|
|
$data = User::find()
|
|
|
->from(User::tableName().' AS U')
|
|
|
->join('LEFT JOIN', CalcBonus::tableName() . ' AS B','B.USER_ID = U.ID')
|
|
|
- ->select('U.ID AS USER_ID, U.USER_NAME, U.LAST_DEC_LV, B.LAST_EMP_LV, B.LAST_ELITE_LV, B.IS_ACTIVE, B.BONUS_E, B.BONUS_PE, B.BONUS_SE, B.BONUS_LB, B.BONUS_ST, B.BONUS_WB, B.BONUS_CAR, B.BONUS_TOTAL, B.BONUS_PB')
|
|
|
+ ->select('U.ID AS USER_ID, U.USER_NAME, U.LAST_DEC_LV, B.LAST_EMP_LV, B.LAST_ELITE_LV, B.IS_ACTIVE, B.BONUS_E, B.BONUS_PE, B.BONUS_SE, B.BONUS_LB, B.BONUS_ST, B.BONUS_WB, B.BONUS_CAR, B.BONUS_TOTAL, B.BONUS_PB, B.BONUS_BB')
|
|
|
->where('USER_ID=:USER_ID AND PERIOD_NUM=:PERIOD_NUM', [':USER_ID' => \Yii::$app->user->id,':PERIOD_NUM'=>$periodNum])
|
|
|
->asArray()
|
|
|
->one();
|
|
|
@@ -335,6 +335,7 @@ class BonusController extends BaseController {
|
|
|
'carBonus' => Tool::formatPrice($data['BONUS_CAR']),
|
|
|
'totalBonus' => Tool::formatPrice($data['BONUS_TOTAL']),
|
|
|
'userPerformanceBonus' => Tool::formatPrice($data['BONUS_PB']),
|
|
|
+ 'userBuilderBonus' => Tool::formatPrice($data['BONUS_BB']),
|
|
|
];
|
|
|
|
|
|
return static::notice($result);
|
