前后台显示奖金字段

backendApi/modules/v1/controllers/BonusController.php

@@ -1007,7 +1007,7 @@ class BonusController extends BaseController {
             'BONUS_TG' => 'CB.BONUS_TG',
             'BONUS_XF' => 'CB.BONUS_XF',
             'BONUS_YJ' => 'CB.BONUS_YJ',
-            'BONUS_GX' => 'CB.BONUS_GX',
+            'ORI_BONUS_GX' => 'CB.ORI_BONUS_GX',
             'BONUS_GL' => 'CB.BONUS_GL',
             // 'BONUS_GL' => 'CB.BONUS_BS',
             'BONUS_QY' => 'CB.BONUS_QY',
@@ -1022,9 +1022,6 @@ class BonusController extends BaseController {
             'CALCULATED_AT' => 'CB.CALCULATED_AT',
             'CALC_MONTH' => 'CB.CALC_MONTH',
             'BONUS_QY_MONTH' => 'CB.BONUS_QY_MONTH',
-
-
-
         ]);
         $period = Period::instance();
         $yearMonth = $period->getYearMonth($periodNum);

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

@@ -447,40 +447,52 @@ class PeriodBonusList extends \common\libs\dataList\DataList implements DataList
                 //         'prop'=>'REAL_BONUS_BS',
                 //     ],
                 // ],
-                'BONUS_GX' => [
-                    'header' => '共享奖',
+                // 'BONUS_GX' => [
+                //     'header' => '共享奖',
+                //     'value' => function($row) {
+                //         return (new Price([
+                //             'value' => $row['BONUS_GX'],
+                //         ]))->result();
+                //     },
+                //     'headerOther' => [
+                //         'width' => '120',
+                //         'prop'=>'BONUS_GX',
+                //     ],
+                // ],
+                'ORI_BONUS_GX' => [
+                    'header' => '周共享奖原金额',
                     'value' => function($row) {
                         return (new Price([
-                            'value' => $row['BONUS_GX'],
+                            'value' => $row['ORI_BONUS_GX'],
                         ]))->result();
                     },
                     'headerOther' => [
                         'width' => '120',
-                        'prop'=>'BONUS_GX',
+                        'prop'=>'ORI_BONUS_GX',
                     ],
                 ],
-                'ORI_BONUS_GX' => [
-                    'header' => '共享奖原金额',
+                'REAL_BONUS_GX' => [
+                    'header' => '月共享奖',
                     'value' => function($row) {
                         return (new Price([
-                            'value' => $row['ORI_BONUS_GX'],
+                            'value' => $row['REAL_BONUS_GX'],
                         ]))->result();
                     },
                     'headerOther' => [
                         'width' => '120',
-                        'prop'=>'ORI_BONUS_GX',
+                        'prop'=>'REAL_BONUS_GX',
                     ],
                 ],
-                'REAL_BONUS_GX' => [
-                    'header' => '实发共享奖',
+                'ORI_MONTH_GX_BONUS' => [
+                    'header' => '月共享奖原金额',
                     'value' => function($row) {
                         return (new Price([
-                            'value' => $row['REAL_BONUS_GX'],
+                            'value' => $row['ORI_MONTH_GX_BONUS'],
                         ]))->result();
                     },
                     'headerOther' => [
                         'width' => '120',
-                        'prop'=>'REAL_BONUS_GX',
+                        'prop'=>'ORI_MONTH_GX_BONUS',
                     ],
                 ],
                 'BONUS_BD' => [
@@ -801,7 +813,7 @@ class PeriodBonusList extends \common\libs\dataList\DataList implements DataList
                 'BONUS_TG'=> ['isUserTable'=> false, 'name'=> '推广奖'],
                 'BONUS_XF'=> ['isUserTable'=> false, 'name'=> '消费奖'],
                 'BONUS_YJ'=> ['isUserTable'=> false, 'name'=> '业绩奖'],
-                'BONUS_GX'=> ['isUserTable'=> false, 'name'=> '共享奖'],
+                'ORI_BONUS_GX'=> ['isUserTable'=> false, 'name'=> '共享奖'],
                 'BONUS_GL'=> ['isUserTable'=> false, 'name'=> '管理奖'],
                 'BONUS_QY'=> ['isUserTable'=> false, 'name'=> '团队奖'],
                 'BONUS_YC'=> ['isUserTable'=> false, 'name'=> '荣衔奖'],

frontendApi/modules/v1/controllers/BonusController.php

@@ -330,7 +330,11 @@ class BonusController extends BaseController {
     private function _periodBonus($periodNum,$detailSwitch=1) {
         $period = Period::instance();
         $yearMonth = $period->getYearMonth($periodNum);
-        if(!$calcBonus = CalcBonus::find()->yearMonth($yearMonth)->where('USER_ID=:USER_ID AND PERIOD_NUM=:PERIOD_NUM',[':USER_ID'=>\Yii::$app->user->id,':PERIOD_NUM'=>$periodNum])->asArray()->one()){
+        if(!$calcBonus = CalcBonus::find()
+        ->yearMonth($yearMonth)
+        ->where('USER_ID=:USER_ID AND PERIOD_NUM=:PERIOD_NUM',[':USER_ID'=>\Yii::$app->user->id,':PERIOD_NUM'=>$periodNum])
+        ->asArray()
+        ->one()){
             return [
 
             ];
@@ -375,7 +379,8 @@ class BonusController extends BaseController {
             // $data[] = ['name' => '管理奖金', 'value' => Tool::formatPrice($calcBonus['ORI_BONUS_BU_GL'])];
 
             if ($sysConfig['openGX']['VALUE']) {
-                $data[] = ['name' => '共享奖金', 'value' => Tool::formatPrice($calcBonus['ORI_BONUS_GX'])];
+                $data[] = ['name' => '周共享奖金', 'value' => Tool::formatPrice($calcBonus['ORI_BONUS_GX'])];
+                $data[] = ['name' => '月共享奖金', 'value' => Tool::formatPrice($calcBonus['ORI_MONTH_GX_BONUS'])];
             }
             if ($sysConfig['openFW']['VALUE']) {
                 if (\Yii::$app->user->id == '670B84FD7C216D4EE055736AECE8644D') {
@@ -459,7 +464,7 @@ class BonusController extends BaseController {
         $showBonusPeriodNum = Cache::getSystemConfig()['showBonusPeriodNum']['VALUE'];
         $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_BONUS_GL,RECONSUME_POINTS,
+        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')
         ->limit($showBonusPeriodNum)
         ->orderBy('PERIOD_NUM DESC')
@@ -495,7 +500,8 @@ class BonusController extends BaseController {
 
                 //共享奖
                 if ($sysConfig['openGX']['VALUE']) {
-                    $calcBonus[$key]['BONUS_GX'] = ['name' => '共享奖金', 'value' => Tool::formatPrice($calcBonus[$key]['ORI_BONUS_GX'])];
+                    $calcBonus[$key]['BONUS_GX'] = ['name' => '周共享奖金', 'value' => Tool::formatPrice($calcBonus[$key]['ORI_BONUS_GX'])];
+                    $calcBonus[$key]['ORI_MONTH_GX_BONUS'] = ['name' => '月共享奖金', 'value' => Tool::formatPrice($calcBonus[$key]['ORI_MONTH_GX_BONUS'])];
                 }
                 //服务奖
                 if ($sysConfig['openFW']['VALUE']) {
@@ -556,6 +562,7 @@ class BonusController extends BaseController {
 
             if ($sysConfig['openGX']['VALUE']) {
                 $tableKey[] = 'BONUS_GX';
+                $tableKey[] = 'ORI_MONTH_GX_BONUS';
             }
             // if ($sysConfig['openYC']['VALUE']) {
             //     $tableKey[] = 'BONUS_YC';