|
|
@@ -319,7 +319,7 @@ class BonusController extends BaseController {
|
|
|
->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')
|
|
|
- ->where('USER_ID=:USER_ID AND PERIOD_NUM=:PERIOD_NUM', [':USER_ID' => \Yii::$app->user->id,' :PERIOD_NUM'=>$periodNum])
|
|
|
+ ->where('USER_ID=:USER_ID AND PERIOD_NUM=:PERIOD_NUM', [':USER_ID' => \Yii::$app->user->id,':PERIOD_NUM'=>$periodNum])
|
|
|
->asArray()
|
|
|
->one();
|
|
|
|
|
|
@@ -365,9 +365,6 @@ class BonusController extends BaseController {
|
|
|
foreach ($calcBonus as $data) {
|
|
|
$result[] = [
|
|
|
'period' => $data['PERIOD_NUM'],
|
|
|
-// 'decLevel' => Cache::getDecLevelConfig()[$data['LAST_DEC_LV']]['LEVEL_NAME'],
|
|
|
-// 'empLevel' => Cache::getEmpLevelConfig()[$data['LAST_EMP_LV']]['LEVEL_NAME'],
|
|
|
-// 'eliteLevel' => Cache::getEliteLevelConfig()[($data['LAST_ELITE_LV'] ?: EliteLevel::getDefaultLevelId())]['LEVEL_NAME'],
|
|
|
'eliteBonus' => Tool::formatPrice($data['BONUS_E']),
|
|
|
'proEliteBonus' => Tool::formatPrice($data['BONUS_PE']),
|
|
|
'superEliteBonus' => Tool::formatPrice($data['BONUS_SE']),
|