|
|
@@ -88,7 +88,7 @@ class BonusController extends BaseController {
|
|
|
// if ($decRole['GOODS_SUBSIDY'] <= 0) $showFl = false;
|
|
|
// }
|
|
|
|
|
|
- $dealSwitch = Cache::getSystemConfig()['dealSwitch']['VALUE'];
|
|
|
+ $dealSwitch = isset(Cache::getSystemConfig()['dealSwitch']) ? Cache::getSystemConfig()['dealSwitch']['VALUE'] : '';
|
|
|
|
|
|
return static::notice(['wallet' => $wallet,'dealSwitch'=>$dealSwitch]);
|
|
|
}
|
|
|
@@ -262,6 +262,7 @@ class BonusController extends BaseController {
|
|
|
if ($sysConfig['openGL']['VALUE']) {
|
|
|
$data[] = ['name' => '管理奖', 'value' => Tool::formatPrice($calcBonus['ORI_BONUS_GL'])];
|
|
|
}
|
|
|
+ $data[] = ['name' => '蓝星管理奖', 'value' => Tool::formatPrice($calcBonus['ORI_BONUS_BS'])];
|
|
|
if ($sysConfig['openJXS']['VALUE']) {
|
|
|
$data[] = ['name' => '团队成长奖', 'value' => Tool::formatPrice($calcBonus['ORI_BONUS_STANDARD'])];
|
|
|
}
|
|
|
@@ -311,7 +312,7 @@ class BonusController extends BaseController {
|
|
|
$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,
|
|
|
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')
|
|
|
+ LAST_DEC_LV,LAST_EMP_LV,EXCHANGE_POINTS,ORI_BONUS_BS')
|
|
|
->limit($showBonusPeriodNum)
|
|
|
->orderBy('PERIOD_NUM DESC')
|
|
|
->asArray()
|
|
|
@@ -357,6 +358,7 @@ class BonusController extends BaseController {
|
|
|
if ($sysConfig['openJXS']['VALUE']) {
|
|
|
$calcBonus[$key]['BONUS_STANDARD'] = ['name' => '团队成长奖', 'value' => Tool::formatPrice($calcBonus[$key]['ORI_BONUS_STANDARD'])];
|
|
|
}
|
|
|
+ $calcBonus[$key]['BONUS_BS'] = ['name' => '蓝星管理奖', 'value' => Tool::formatPrice($calcBonus[$key]['ORI_BONUS_BS'])];
|
|
|
$calcBonus[$key]['BONUS_TOTAL'] = ['name' => '总奖金', 'value' => Tool::formatPrice($calcBonus[$key]['BONUS_TOTAL'])];
|
|
|
$calcBonus[$key]['MANAGE_TAX'] = ['name' => '管理费', 'value' => Tool::formatPrice($calcBonus[$key]['MANAGE_TAX'])];
|
|
|
$calcBonus[$key]['BONUS_REAL'] = ['name' => '实发奖金', 'value' => Tool::formatPrice($calcBonus[$key]['BONUS_REAL'])];
|
|
|
@@ -401,6 +403,7 @@ class BonusController extends BaseController {
|
|
|
if ($sysConfig['openJXS']['VALUE']) {
|
|
|
$tableKey[] = 'BONUS_STANDARD';
|
|
|
}
|
|
|
+ $tableKey[] = 'BONUS_BS';
|
|
|
$tableKey[] = 'BONUS_TOTAL';
|
|
|
$tableKey[] = 'RECONSUME_POINTS';
|
|
|
$tableKey[] = 'EXCHANGE_POINTS';
|