gl改成查询蓝星字段

backendApi/modules/v1/controllers/BonusController.php

@@ -796,7 +796,7 @@ class BonusController extends BaseController {
             'BONUS_TG' => 'CB.BONUS_TG',
             'BONUS_YJ' => 'CB.BONUS_YJ',
             'BONUS_GX' => 'CB.BONUS_GX',
-            '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',
@@ -868,7 +868,7 @@ class BonusController extends BaseController {
             'BONUS_TG' => 'CB.BONUS_TG',
             'BONUS_YJ' => 'CB.BONUS_YJ',
             'BONUS_GX' => 'CB.BONUS_GX',
-            '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,7 +942,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_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,40 +407,41 @@ class PeriodBonusList extends \common\libs\dataList\DataList implements DataList
                         'prop'=>'REAL_BONUS_GX',
                     ],
                 ],
+                // 因为以前的管理奖被替换为蓝星奖,所以以前的管理奖,改成蓝星奖.
                 'BONUS_GL' => [
                     'header' => '管理奖',
                     'value' => function($row) {
                         return (new Price([
-                            'value' => $row['BONUS_GL'],
+                            'value' => $row['BONUS_BS'],
                         ]))->result();
                     },
                     'headerOther' => [
                         'width' => '120',
-                        'prop'=>'BONUS_GL',
+                        'prop'=>'BONUS_BS',
                     ],
                 ],
                 'ORI_BONUS_GL' => [
                     'header' => '管理奖原金额',
                     'value' => function($row) {
                         return (new Price([
-                            'value' => $row['ORI_BONUS_GL'],
+                            'value' => $row['ORI_BONUS_BS'],
                         ]))->result();
                     },
                     'headerOther' => [
                         'width' => '120',
-                        'prop'=>'ORI_BONUS_GL',
+                        'prop'=>'ORI_BONUS_BS',
                     ],
                 ],
                 'REAL_BONUS_GL' => [
                     'header' => '实发管理奖',
                     'value' => function($row) {
                         return (new Price([
-                            'value' => $row['REAL_BONUS_GL'],
+                            'value' => $row['REAL_BONUS_BS'],
                         ]))->result();
                     },
                     'headerOther' => [
                         'width' => '120',
-                        'prop'=>'REAL_BONUS_GL',
+                        'prop'=>'REAL_BONUS_BS',
                     ],
                 ],
                 'BONUS_QY' => [

common/helpers/bonus/BonusCalc.php

@@ -2977,6 +2977,26 @@ class BonusCalc extends BaseObject {
 //        }
         $pervSurplusPerf = CalcCache::surplusPerf($userId, $this->_periodNum);
 
+        // //没有共享和管理奖 以前的管理奖和共享奖逻辑
+        // $bonusReal = $bonus['BONUS_BD'] + $bonus['BONUS_TG'] + $bonus['BONUS_XF'] + $bonus['BONUS_YJ'] + $bonus['BONUS_QY'] + $bonus['BONUS_YC'] + $bonus['BONUS_YC_EXTRA'] + $bonus['BONUS_VIP'] + $standardBonus;
+        // $realBonusGx = 0;
+        // $realBonusGl = 0;
+        // if( $this->_isCalcMonth ) {
+        //     //查看是否复消300
+        //     $monthPerfData = CalcCache::nowMonthPerf($userId, $this->_periodNum);
+        //     $fxPvStatus = $monthPerfData['PV_PCS_FX'] >= $this->_sysConfig['monthPcsPvFxCondition']['VALUE'];
+        //     if ( $fxPvStatus ) {//加上本期和往期的共享和管理奖
+        //         $monthSumData = CalcBonus::findUseSlaves()->select('SUM(BONUS_GX) AS BONUS_GX_SUM, SUM(BONUS_GL) AS BONUS_GL_SUM')->where('USER_ID=:USER_ID AND CALC_MONTH=:CALC_MONTH', ['USER_ID'=>$userId, 'CALC_MONTH'=>$this->_calcYearMonth])->asArray()->one();
+        //         $bonusGxSum = $monthSumData['BONUS_GX_SUM'] ?? 0;
+        //         $bonusGlSum = $monthSumData['BONUS_GL_SUM'] ?? 0;
+        //         $realBonusGx += $bonusGxSum + $bonus['BONUS_GX'];
+        //         $realBonusGl += $bonusGlSum + $bonus['BONUS_GL'];
+        //         $bonusReal += $realBonusGx + $realBonusGl;
+        //         unset($monthSumData, $bonusGxSum, $bonusGlSum);
+        //     }
+        // }
+
+
         //没有共享和管理奖
         $bonusReal = $bonus['BONUS_BD'] + $bonus['BONUS_TG'] + $bonus['BONUS_XF'] + $bonus['BONUS_YJ'] + $bonus['BONUS_QY'] + $bonus['BONUS_YC'] + $bonus['BONUS_YC_EXTRA'] + $bonus['BONUS_VIP'] + $standardBonus;
         $realBonusGx = 0;
@@ -3111,6 +3131,7 @@ class BonusCalc extends BaseObject {
             'REAL_BONUS_GL' => $realBonusGl,
             'BONUS_BS' => $realBonusBs, // 新的管理奖金,即蓝星奖,顶替原来的管理奖
             'ORI_BONUS_BS' => $buleStartOriBonus, // 蓝星管理奖金原奖金,即包含管理费
+            'REAL_BONUS_GL' => $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'],