修改字段名

ALTER TABLE AR_CALC_BONUS_BS CHANGE COLU.sql

@@ -0,0 +1,20 @@
+ALTER TABLE AR_CALC_BONUS_BS CHANGE COLUMN ORI_BONUS_BU_YJ  ORI_BONUS_ABBR decimal(16,3) not null default 0.000 comment "蓝星业绩奖，原奖金";
+ALTER TABLE AR_CALC_BONUS_BS CHANGE COLUMN ORI_BONUS_BU_YJKC  MANAGE_TAX_ABBR decimal(16,3) not null default 0.000 comment "蓝星业绩奖，管理费";
+ALTER TABLE AR_CALC_BONUS_BS CHANGE COLUMN ORI_BONUS_BU_YJSF  AMOUNT_ABBR decimal(16,3) not null default 0.000 comment "蓝星业绩奖，实发奖金";
+ALTER TABLE AR_CALC_BONUS_BS CHANGE COLUMN ORI_BONUS_BU_YJFX  ABBR_RECONSUME_POINTS decimal(16,3) not null default 0.000 comment "蓝星业绩奖，复效积分";
+ALTER TABLE AR_CALC_BONUS_BS CHANGE COLUMN ORI_BONUS_BU_GL  ORI_BONUS_MNT decimal(16,3) not null default 0.000 comment "蓝星管理奖，原奖金";
+ALTER TABLE AR_CALC_BONUS_BS CHANGE COLUMN ORI_BONUS_BU_GLKC  MANAGE_TAX_MNT decimal(16,3) not null default 0.000 comment "蓝星管理奖，管理费";
+ALTER TABLE AR_CALC_BONUS_BS CHANGE COLUMN ORI_BONUS_BU_GLSF  AMOUNT_MNT decimal(16,3) not null default 0.000 comment "蓝星管理奖，实发奖金";
+ALTER TABLE AR_CALC_BONUS_BS CHANGE COLUMN ORI_BONUS_BU_GLFX  MNT_RECONSUME_POINTS decimal(16,3) not null default 0.000 comment "蓝星管理奖，复效积分";
+ALTER TABLE AR_CALC_BONUS_BS_DETAIL CHANGE COLUMN ORI_BONUS_BU_YJ  ORI_BONUS_ABBR decimal(16,3) not null default 0.000 comment "蓝星业绩奖，原奖金";
+ALTER TABLE AR_CALC_BONUS_BS_DETAIL CHANGE COLUMN ORI_BONUS_BU_YJSF  AMOUNT_ABBR decimal(16,3) not null default 0.000 comment "蓝星业绩奖，实发奖金";
+ALTER TABLE AR_CALC_BONUS_BS_DETAIL CHANGE COLUMN ORI_BONUS_BU_GL  ORI_BONUS_MNT decimal(16,3) not null default 0.000 comment "蓝星管理奖，原奖金";
+ALTER TABLE AR_CALC_BONUS_BS_DETAIL CHANGE COLUMN ORI_BONUS_BU_GLSF  AMOUNT_MNT decimal(16,3) not null default 0.000 comment "蓝星管理奖，实发奖金";
+ALTER TABLE AR_CALC_BONUS_BS_STAT CHANGE COLUMN BONUS_BU_YJ  BONUS_ABBR decimal(12,2) default 0.00 comment "蓝星业绩奖";
+ALTER TABLE AR_CALC_BONUS_BS_STAT CHANGE COLUMN BONUS_BU_YJ_PERCENT  BONUS_ABBR_PERCENT decimal(12,2) default 0.00 comment "蓝星业绩奖，拨比";
+ALTER TABLE AR_CALC_BONUS_BS_STAT CHANGE COLUMN BONUS_BU_GL  BONUS_MNT decimal(12,2) default 0.00 comment "蓝星管理奖";
+ALTER TABLE AR_CALC_BONUS_BS_STAT CHANGE COLUMN BONUS_BU_GL_PERCENT  BONUS_MNT_PERCENT decimal(12,2) default 0.00 comment "蓝星管理奖，拨比";
+ALTER TABLE AR_CALC_BONUS CHANGE COLUMN ORI_BONUS_BU_YJ  ORI_BONUS_ABBR decimal(16,3) not null default 0.000 comment "蓝星业绩奖，原奖金";
+ALTER TABLE AR_CALC_BONUS CHANGE COLUMN ORI_BONUS_BU_YJSF  BONUS_ABBR decimal(16,3) not null default 0.000 comment "蓝星业绩奖，实发奖金";
+ALTER TABLE AR_CALC_BONUS CHANGE COLUMN ORI_BONUS_BU_GL  ORI_BONUS_MNT decimal(16,3) not null default 0.000 comment "蓝星管理奖，原奖金";
+ALTER TABLE AR_CALC_BONUS CHANGE COLUMN ORI_BONUS_BU_GLSF  BONUS_MNT decimal(16,3) not null default 0.000 comment "蓝星管理奖，实发奖金";

backendApi/modules/v1/models/lists/bonus/PeriodBonusList.php

@@ -337,77 +337,53 @@ class PeriodBonusList extends \common\libs\dataList\DataList implements DataList
                 ],
 
 
-                'ORI_BONUS_BU_YJ' => [
+                'ORI_BONUS_ABBR' => [
                     'header' => '蓝星业绩奖原金额',
                     'value' => function($row) {
                         return (new Price([
-                            'value' => $row['ORI_BONUS_BU_YJ'],
+                            'value' => $row['ORI_BONUS_ABBR'],
                         ]))->result();
                     },
                     'headerOther' => [
                         'width' => '150',
-                        'prop'=>'ORI_BONUS_BU_YJ',
+                        'prop'=>'ORI_BONUS_ABBR',
                     ],
                 ],
-//                'ORI_BONUS_BU_YJKC' => [
-//                    'header' => '蓝星业绩奖(管理费)',
-//                    'value' => function($row) {
-//                        return (new Price([
-//                            'value' => $row['ORI_BONUS_BU_YJKC'],
-//                        ]))->result();
-//                    },
-//                    'headerOther' => [
-//                        'width' => '150',
-//                        'prop'=>'ORI_BONUS_BU_YJKC',
-//                    ],
-//                ],
-                'ORI_BONUS_BU_YJSF' => [
+                'AMOUNT_ABBR' => [
                     'header' => '蓝星业绩奖',
                     'value' => function($row) {
                         return (new Price([
-                            'value' => $row['ORI_BONUS_BU_YJSF'],
+                            'value' => $row['AMOUNT_ABBR'],
                         ]))->result();
                     },
                     'headerOther' => [
                         'width' => '150',
-                        'prop'=>'ORI_BONUS_BU_YJSF',
+                        'prop'=>'AMOUNT_ABBR',
                     ],
                 ],
 
-                'ORI_BONUS_BU_GL' => [
+                'ORI_BONUS_MNT' => [
                     'header' => '蓝星管理奖原金额',
                     'value' => function($row) {
                         return (new Price([
-                            'value' => $row['ORI_BONUS_BU_GL'],
+                            'value' => $row['ORI_BONUS_MNT'],
                         ]))->result();
                     },
                     'headerOther' => [
                         'width' => '150',
-                        'prop'=>'ORI_BONUS_BU_GL',
+                        'prop'=>'ORI_BONUS_MNT',
                     ],
                 ],
-//                'ORI_BONUS_BU_GLKC' => [
-//                    'header' => '蓝星管理奖(管理费)',
-//                    'value' => function($row) {
-//                        return (new Price([
-//                            'value' => $row['ORI_BONUS_BU_GLKC'],
-//                        ]))->result();
-//                    },
-//                    'headerOther' => [
-//                        'width' => '150',
-//                        'prop'=>'ORI_BONUS_BU_GLKC',
-//                    ],
-//                ],
-                'ORI_BONUS_BU_GLSF' => [
+                'AMOUNT_MNT' => [
                     'header' => '蓝星管理奖',
                     'value' => function($row) {
                         return (new Price([
-                            'value' => $row['ORI_BONUS_BU_GLSF'],
+                            'value' => $row['AMOUNT_MNT'],
                         ]))->result();
                     },
                     'headerOther' => [
                         'width' => '150',
-                        'prop'=>'ORI_BONUS_BU_GLSF',
+                        'prop'=>'AMOUNT_MNT',
                     ],
                 ],
 

common/helpers/bonus/BonusCalc.php

@@ -1712,10 +1712,9 @@ class BonusCalc extends BaseObject {
                 $fxStatus = $this->_isMonthPerfLimit($user['USER_ID']);
                 if ($fxStatus) {
                     //扣除相应的复消积分和管理费
-                    $deductData = $this->deduct($user['USER_ID'], $user['ORI_BONUS_BU_GL']);
+                    $deductData = $this->deduct($user['USER_ID'], $user['ORI_BONUS_MNT']);
                     // 把对碰后的奖金存入缓存中
-                    //CalcCache::bonus($user['USER_ID'], $this->_periodNum, 'BONUS_BU_GL', $user['ORI_BONUS_BU_GL'], $deductData);
-                    CalcCache::bonus($user['USER_ID'], $this->_periodNum, 'BONUS_BU_GL', $user['ORI_BONUS_BU_GL']);
+                    CalcCache::bonus($user['USER_ID'], $this->_periodNum, 'BONUS_BU_GL', $user['ORI_BONUS_MNT']);
                     $realBonusBs = $deductData['surplus']; // 扣除管理费和复消积分后的实发蓝星奖金
                     $manageTax = $deductData['manageTax']; // 管理费
                     $point = $deductData['reConsumePoints'];// 复消积分
@@ -1723,15 +1722,15 @@ class BonusCalc extends BaseObject {
                 //CalcCache::bonus($user['USER_ID'], $this->_periodNum, 'BONUS_BU_GLKC', $manageTax);
                 } else {
                     // 如果未满足月消费,则不扣除管理费和复消积分了
-                    CalcCache::bonus($user['USER_ID'], $this->_periodNum, 'BONUS_BU_GL', $user['ORI_BONUS_BU_GL']);
-                    $realBonusBs = $user['ORI_BONUS_BU_GL'];
+                    CalcCache::bonus($user['USER_ID'], $this->_periodNum, 'BONUS_BU_GL', $user['ORI_BONUS_MNT']);
+                    $realBonusBs = $user['ORI_BONUS_MNT'];
                     $manageTax = 0; // 管理费
                     $point = 0;// 复消积分
                 }
                 
 
                 // 更新蓝星奖金存储过程的实发金额数据
-                CalcBonusBS::updateAll(['ORI_BONUS_BU_GLSF' => $realBonusBs, 'ORI_BONUS_BU_GLKC' => $manageTax, 'ORI_BONUS_BU_GLFX' => $point],
+                CalcBonusBS::updateAll(['AMOUNT_MNT' => $realBonusBs, 'MANAGE_TAX_MNT' => $manageTax, 'MNT_RECONSUME_POINTS' => $point],
                 'USER_ID=:USER_ID AND PERIOD_NUM=:PERIOD_NUM', 
                 [':USER_ID' => $user['USER_ID'], ':PERIOD_NUM' => $this->_periodNum]);
             }
@@ -1770,10 +1769,9 @@ class BonusCalc extends BaseObject {
                 $fxStatus = $this->_isMonthPerfLimit($user['USER_ID']);
                 if ($fxStatus) {
                     //扣除相应的复消积分和管理费
-                    $deductData = $this->deduct($user['USER_ID'], $user['ORI_BONUS_BU_YJ']);
+                    $deductData = $this->deduct($user['USER_ID'], $user['ORI_BONUS_ABBR']);
                     // 把对碰后的奖金存入缓存中
-                    //CalcCache::bonus($user['USER_ID'], $this->_periodNum, 'BONUS_BU_YJ', $user['ORI_BONUS_BU_YJ'], $deductData);
-                    CalcCache::bonus($user['USER_ID'], $this->_periodNum, 'BONUS_BU_YJ', $user['ORI_BONUS_BU_YJ']);
+                    CalcCache::bonus($user['USER_ID'], $this->_periodNum, 'BONUS_BU_YJ', $user['ORI_BONUS_ABBR']);
                     $realBonusBs = $deductData['surplus']; // 扣除管理费和复消积分后的实发蓝星奖金
                     $manageTax = $deductData['manageTax']; // 管理费
                     $point = $deductData['reConsumePoints'];// 复消积分
@@ -1781,15 +1779,15 @@ class BonusCalc extends BaseObject {
                     //CalcCache::bonus($user['USER_ID'], $this->_periodNum, 'BONUS_BU_YJKC', $manageTax);
                 } else {
                     // 如果未满足月消费,则不扣除管理费和复消积分了
-                    CalcCache::bonus($user['USER_ID'], $this->_periodNum, 'BONUS_BU_YJ', $user['ORI_BONUS_BU_YJ']);
-                    $realBonusBs = $user['ORI_BONUS_BU_YJ'];
+                    CalcCache::bonus($user['USER_ID'], $this->_periodNum, 'BONUS_BU_YJ', $user['ORI_BONUS_ABBR']);
+                    $realBonusBs = $user['ORI_BONUS_ABBR'];
                     $manageTax = 0; // 管理费
                     $point = 0;// 复消积分
                 }
 
 
                 // 更新蓝星奖金存储过程的实发金额数据
-                CalcBonusBS::updateAll(['ORI_BONUS_BU_YJSF' => $realBonusBs, 'ORI_BONUS_BU_YJKC' => $manageTax, 'ORI_BONUS_BU_YJFX' => $point],
+                CalcBonusBS::updateAll(['AMOUNT_ABBR' => $realBonusBs, 'MANAGE_TAX_ABBR' => $manageTax, 'ABBR_RECONSUME_POINTS' => $point],
                     'USER_ID=:USER_ID AND PERIOD_NUM=:PERIOD_NUM',
                     [':USER_ID' => $user['USER_ID'], ':PERIOD_NUM' => $this->_periodNum]);
             }
@@ -3392,7 +3390,7 @@ class BonusCalc extends BaseObject {
                         ':USER_ID' => $userId
                     ]
                 )
-                ->select('AMOUNT,ORI_BONUS,MANAGE_TAX,LEVEL_ID,PRODUCT_POINT,ORI_BONUS_BU_YJ,ORI_BONUS_BU_YJSF,ORI_BONUS_BU_GL,ORI_BONUS_BU_GLSF')
+                ->select('AMOUNT,ORI_BONUS,MANAGE_TAX,LEVEL_ID,PRODUCT_POINT,ORI_BONUS_ABBR,AMOUNT_ABBR,ORI_BONUS_MNT,AMOUNT_MNT')
                 ->limit(1)
                 ->orderBy('CREATED_AT DESC')
                 ->asArray()
@@ -3401,11 +3399,11 @@ class BonusCalc extends BaseObject {
                 $blueStartAmount = isset($userBS['AMOUNT']) && !empty($userBS['AMOUNT']) ? $userBS['AMOUNT'] : 0; // 奖金
                 $buleStartOriBonus = isset($userBS['ORI_BONUS']) && !empty($userBS['ORI_BONUS']) ? $userBS['ORI_BONUS'] : 0; // 原奖金
 
-                $blueBonusGL = isset($userBS['ORI_BONUS_BU_GL']) && !empty($userBS['ORI_BONUS_BU_GL']) ? $userBS['ORI_BONUS_BU_GL'] : 0; // 拆分管理奖原奖金
-                $blueBonusYJ = isset($userBS['ORI_BONUS_BU_YJ']) && !empty($userBS['ORI_BONUS_BU_YJ']) ? $userBS['ORI_BONUS_BU_YJ'] : 0; // 拆分业绩奖原奖金
+                $blueBonusGL = isset($userBS['ORI_BONUS_MNT']) && !empty($userBS['ORI_BONUS_MNT']) ? $userBS['ORI_BONUS_MNT'] : 0; // 拆分管理奖原奖金
+                $blueBonusYJ = isset($userBS['ORI_BONUS_ABBR']) && !empty($userBS['ORI_BONUS_ABBR']) ? $userBS['ORI_BONUS_ABBR'] : 0; // 拆分业绩奖原奖金
 
-                $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; // 拆分业绩奖 实发
+                $blueBonusGLSF = isset($userBS['AMOUNT_MNT']) && !empty($userBS['AMOUNT_MNT']) ? $userBS['AMOUNT_MNT'] : 0; // 拆分管理奖 实发
+                $blueBonusYJSF = isset($userBS['AMOUNT_ABBR']) && !empty($userBS['AMOUNT_ABBR']) ? $userBS['AMOUNT_ABBR'] : 0; // 拆分业绩奖 实发
 
                 //$blueStartAmount = $blueBonusGLSF + $blueBonusYJSF; // 总实发，管理奖实发+业绩奖实发
                 #rm1820 共享奖金月节点合起来原奖金一起扣除管理费和复消积分
@@ -3447,8 +3445,8 @@ class BonusCalc extends BaseObject {
                 // 蓝星奖原奖金在扣管理费的时候被加入到了BONUS_TOTAL,需要再减去原奖金
                 $oriBonusBs = isset($bonus['ORI_BONUS_BS']) && $bonus['ORI_BONUS_BS'] > 0 ? $bonus['ORI_BONUS_BS'] : 0;
                 // 如果未满足,则复消积分,应该不能发放
-                $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;
+                $oriBonusBsYJCF = isset($bonus['ORI_BONUS_ABBR']) && $bonus['ORI_BONUS_ABBR'] > 0 ? $bonus['ORI_BONUS_ABBR'] : 0;
+                $oriBonusBsGLCF = isset($bonus['ORI_BONUS_MNT']) && $bonus['ORI_BONUS_MNT'] > 0 ? $bonus['ORI_BONUS_MNT'] : 0;
                 $bonus['BONUS_TOTAL'] = $bonus['BONUS_TOTAL'] - $oriBonusBs - $oriBonusBsYJCF - $oriBonusBsGLCF;
             }
         }
@@ -3516,16 +3514,11 @@ class BonusCalc extends BaseObject {
             'ORI_BONUS_VIP' => $bonus['ORI_BONUS_VIP'],
             'ORI_BONUS_STANDARD' => $standardBonus,
 
+            'AMOUNT_MNT' => $blueBonusGLSF,
+            'ORI_BONUS_MNT' => $blueBonusGL,
 
-
-           // 'ORI_BONUS_BU_GLSF' => $bonus['BONUS_BU_GL'],
-            'ORI_BONUS_BU_GLSF' => $blueBonusGLSF,
-            'ORI_BONUS_BU_GL' => $blueBonusGL,
-
-
-            'ORI_BONUS_BU_YJ' => $blueBonusYJ,
-           // 'ORI_BONUS_BU_YJSF' => $bonus['BONUS_BU_YJ'],
-            'ORI_BONUS_BU_YJSF' => $blueBonusYJSF,
+            'ORI_BONUS_ABBR' => $blueBonusYJ,
+            'AMOUNT_ABBR' => $blueBonusYJSF,
 
             //以下没有用
             'BONUS_FW' => 0,

common/helpers/bonus/CalcCache.php

@@ -1437,8 +1437,8 @@ class CalcCache {
 
             'BONUS_BU_GL'=>0,  //蓝星管理奖实发
             'BONUS_BU_YJ'=>0,  // 蓝星业绩奖实发
-            'ORI_BONUS_BU_GL'=>0, //蓝星管理奖原奖金
-            'ORI_BONUS_BU_YJ'=>0, //蓝星业绩奖原奖金
+            'ORI_BONUS_MNT'=>0, //蓝星管理奖原奖金
+            'ORI_BONUS_ABBR'=>0, //蓝星业绩奖原奖金
             'BONUS_BU_GLKC'=>0, //蓝星管理奖，管理费
             'BONUS_BU_YJKC'=>0, //蓝星业绩奖，管理费
 

common/models/CalcBonus.php

@@ -235,9 +235,9 @@ class CalcBonus extends \common\components\ActiveRecord
             'BONUS_BS' => '蓝星奖',
             'ORI_BONUS_BS' => '蓝星原奖金',
 
-            'ORI_BONUS_BU_GL'=>'蓝星管理奖原奖金',
-            'ORI_BONUS_BU_GLKC'=>'蓝星管理奖管理费',
-            'ORI_BONUS_BU_GLSF'=>'蓝星管理奖实发',
+            'ORI_BONUS_MNT'=>'蓝星管理奖原奖金',
+            'MANAGE_TAX_MNT'=>'蓝星管理奖管理费',
+            'AMOUNT_MNT'=>'蓝星管理奖实发',
             'ORI_BONUS_BU_YJ'=>'蓝星业绩奖原奖金',
             'ORI_BONUS_BU_YJKC'=>'蓝星业绩奖管理费',
             'ORI_BONUS_BU_YJSF'=>'蓝星业绩奖实发'

common/models/CalcBonusBS.php

@@ -76,9 +76,9 @@ class CalcBonusBS extends \common\components\ActiveRecord
             'ORI_BONUS_BU_YJ'=>'蓝星业绩原奖金',
             'ORI_BONUS_BU_YJKC'=>'蓝星业绩管理费',
             'ORI_BONUS_BU_YJSF'=>'蓝星业绩实发',
-            'ORI_BONUS_BU_GL'=>'蓝星管理原奖金',
-            'ORI_BONUS_BU_GLKC'=>'蓝星管理奖管理费',
-            'ORI_BONUS_BU_GLSF'=>'蓝星管理奖实发'
+            'ORI_BONUS_MNT'=>'蓝星管理原奖金',
+            'MANAGE_TAX_MNT'=>'蓝星管理奖管理费',
+            'AMOUNT_MNT'=>'蓝星管理奖实发'
         ];
     }
 }

common/models/CalcBonusBsDetail.php

@@ -75,9 +75,9 @@ class CalcBonusBsDetail extends \common\components\ActiveRecord
             'ORI_BONUS_BU_YJ'=>'蓝星业绩原奖金',
             'ORI_BONUS_BU_YJKC'=>'蓝星业绩管理费',
             'ORI_BONUS_BU_YJSF'=>'蓝星业绩实发',
-            'ORI_BONUS_BU_GL'=>'蓝星管理原奖金',
-            'ORI_BONUS_BU_GLKC'=>'蓝星管理奖管理费',
-            'ORI_BONUS_BU_GLSF'=>'蓝星管理奖实发'
+            'ORI_BONUS_MNT'=>'蓝星管理原奖金',
+            'MANAGE_TAX_MNT'=>'蓝星管理奖管理费',
+            'AMOUNT_MNT'=>'蓝星管理奖实发'
         ];
     }
 

frontendApi/modules/v1/controllers/BonusController.php

@@ -373,10 +373,6 @@ class BonusController extends BaseController {
             }
             // 管理奖金 就是新的蓝星奖
             $data[] = ['name' => '管理奖金', 'value' => Tool::formatPrice($calcBonus['ORI_BONUS_BS'])];
-            // //蓝星业绩奖
-            // $data[] = ['name' => '业绩奖金', 'value' => Tool::formatPrice($calcBonus['ORI_BONUS_BU_YJ'])];
-            // //蓝星管理奖
-            // $data[] = ['name' => '管理奖金', 'value' => Tool::formatPrice($calcBonus['ORI_BONUS_BU_GL'])];
 
             if ($sysConfig['openGX']['VALUE']) {
                 $data[] = ['name' => '周共享奖金', 'value' => Tool::formatPrice($calcBonus['ORI_BONUS_GX'])];
@@ -465,7 +461,7 @@ class BonusController extends BaseController {
         $calcBonus = CalcBonus::find()->where('USER_ID=:USER_ID AND IS_SENT=1', [':USER_ID' => \Yii::$app->user->id])
         ->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_MONTH_GX_BONUS,ORI_BONUS_GL,RECONSUME_POINTS,
-        LAST_DEC_LV,LAST_EMP_LV,EXCHANGE_POINTS,ORI_BONUS_BS,ORI_BONUS_BU_GL,ORI_BONUS_BU_YJ')
+        LAST_DEC_LV,LAST_EMP_LV,EXCHANGE_POINTS,ORI_BONUS_BS,ORI_BONUS_MNT,ORI_BONUS_ABBR')
         ->limit($showBonusPeriodNum)
         ->orderBy('PERIOD_NUM DESC')
         ->asArray()
@@ -492,12 +488,6 @@ class BonusController extends BaseController {
                 // 管理奖金 就是新的蓝星奖金
                 $calcBonus[$key]['BONUS_BS'] = ['name' => '管理奖金', 'value' => Tool::formatPrice($calcBonus[$key]['ORI_BONUS_BS'])];
 
-                // // 蓝星业绩奖
-                // $calcBonus[$key]['ORI_BONUS_BU_YJ'] = ['name' => '业绩奖金', 'value' => Tool::formatPrice($calcBonus[$key]['ORI_BONUS_BU_YJ'])];
-
-                // // 蓝星管理奖
-                // $calcBonus[$key]['ORI_BONUS_BU_GL'] = ['name' => '管理奖金', 'value' => Tool::formatPrice($calcBonus[$key]['ORI_BONUS_BU_GL'])];
-
                 //共享奖
                 if ($sysConfig['openGX']['VALUE']) {
                     $calcBonus[$key]['BONUS_GX'] = ['name' => '周共享奖金', 'value' => Tool::formatPrice($calcBonus[$key]['ORI_BONUS_GX'])];
@@ -557,19 +547,10 @@ class BonusController extends BaseController {
             }
             $tableKey[] = 'BONUS_BS';
 
-            // $tableKey[] = 'ORI_BONUS_BU_YJ';
-            // $tableKey[] = 'ORI_BONUS_BU_GL';
-
             if ($sysConfig['openGX']['VALUE']) {
                 $tableKey[] = 'BONUS_GX';
                 $tableKey[] = 'ORI_MONTH_GX_BONUS';
             }
-            // if ($sysConfig['openYC']['VALUE']) {
-            //     $tableKey[] = 'BONUS_YC';
-            // }
-            // if ($sysConfig['openVIP']['VALUE']) {
-            //     $tableKey[] = 'BONUS_VIP';
-            // }
             if ($sysConfig['openFW']['VALUE']) {
                 $tableKey[] = 'BONUS_BD';
             }