将被覆盖的最新奖金中的管理奖字段还原

backendApi/modules/v1/controllers/BonusController.php

@@ -796,7 +796,8 @@ class BonusController extends BaseController {
             'BONUS_TG' => 'CB.BONUS_TG',
             'BONUS_YJ' => 'CB.BONUS_YJ',
             'BONUS_GX' => 'CB.BONUS_GX',
-            'BONUS_GL' => 'CB.BONUS_BS',
+            // 'BONUS_GL' => 'CB.BONUS_BS',
+            'BONUS_GL' => 'CB.BONUS_GL',
             'BONUS_QY' => 'CB.BONUS_QY',
             'BONUS_YC' => 'CB.BONUS_YC',
             'PV_1L' => 'CB.PV_1L',
@@ -868,7 +869,8 @@ class BonusController extends BaseController {
             'BONUS_TG' => 'CB.BONUS_TG',
             'BONUS_YJ' => 'CB.BONUS_YJ',
             'BONUS_GX' => 'CB.BONUS_GX',
-            'BONUS_GL' => 'CB.BONUS_BS',
+            'BONUS_GL' => 'CB.BONUS_GL',
+            // 'BONUS_GL' => 'CB.BONUS_BS',
             'BONUS_QY' => 'CB.BONUS_QY',
             'BONUS_YC' => 'CB.BONUS_YC',
             'PV_1L' => 'CB.PV_1L',
@@ -942,8 +944,8 @@ class BonusController extends BaseController {
             'BONUS_XF' => 'CB.BONUS_XF',
             'BONUS_YJ' => 'CB.BONUS_YJ',
             'BONUS_GX' => 'CB.BONUS_GX',
-            // 'BONUS_GL' => 'CB.BONUS_GL',
-            'BONUS_GL' => 'CB.BONUS_BS',
+            'BONUS_GL' => 'CB.BONUS_GL',
+            // 'BONUS_GL' => 'CB.BONUS_BS',
             'BONUS_QY' => 'CB.BONUS_QY',
             'BONUS_YC' => 'CB.BONUS_YC',
             'ORI_BONUS_STANDARD' => 'CB.ORI_BONUS_STANDARD',

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

@@ -407,41 +407,41 @@ class PeriodBonusList extends \common\libs\dataList\DataList implements DataList
                         'prop'=>'REAL_BONUS_GX',
                     ],
                 ],
-                // 因为以前的管理奖被替换为蓝星奖,所以以前的管理奖,改成蓝星奖.
+                // BS为蓝星管理奖
                 'BONUS_GL' => [
                     'header' => '管理奖',
                     'value' => function($row) {
                         return (new Price([
-                            'value' => $row['BONUS_BS'],
+                            'value' => $row['BONUS_GL'],
                         ]))->result();
                     },
                     'headerOther' => [
                         'width' => '120',
-                        'prop'=>'BONUS_BS',
+                        'prop'=>'BONUS_GL',
                     ],
                 ],
                 'ORI_BONUS_GL' => [
                     'header' => '管理奖原金额',
                     'value' => function($row) {
                         return (new Price([
-                            'value' => $row['ORI_BONUS_BS'],
+                            'value' => $row['ORI_BONUS_GL'],
                         ]))->result();
                     },
                     'headerOther' => [
                         'width' => '120',
-                        'prop'=>'ORI_BONUS_BS',
+                        'prop'=>'ORI_BONUS_GL',
                     ],
                 ],
                 'REAL_BONUS_GL' => [
                     'header' => '实发管理奖',
                     'value' => function($row) {
                         return (new Price([
-                            'value' => $row['REAL_BONUS_BS'],
+                            'value' => $row['REAL_BONUS_GL'],
                         ]))->result();
                     },
                     'headerOther' => [
                         'width' => '120',
-                        'prop'=>'REAL_BONUS_BS',
+                        'prop'=>'REAL_BONUS_GL',
                     ],
                 ],
                 'BONUS_QY' => [

common/helpers/bonus/BonusCalc.php

@@ -3176,9 +3176,9 @@ class BonusCalc extends BaseObject {
             'REAL_BONUS_GX' => $realBonusGx,
             'ORI_BONUS_GL' => $bonus['ORI_BONUS_GL'],
             'REAL_BONUS_GL' => $realBonusGl,
-            'BONUS_BS' => $realBonusBs, // 新的管理奖金,即蓝星奖,顶替原来的管理奖
+            'BONUS_BS' => $realBonusBs, // 新的管理奖金,即蓝星管理奖
             'ORI_BONUS_BS' => $buleStartOriBonus, // 蓝星管理奖金原奖金,即包含管理费
-            'REAL_BONUS_GL' => $realBonusBs, // 实发蓝星奖金,即新的管理奖
+            'REAL_BONUS_BS' => $realBonusBs, // 实发蓝星管理奖金
             'ORI_BONUS_GL_BD' => $bonus['ORI_BONUS_GL_BD'],
             'ORI_BONUS_GL_FX' => $bonus['ORI_BONUS_GL_FX'],
             'ORI_BONUS_QY' => $bonus['ORI_BONUS_QY'],