店服务奖显示,不需要打包

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

@@ -495,6 +495,30 @@ class PeriodBonusList extends \common\libs\dataList\DataList implements DataList
                         'prop'=>'ORI_MONTH_GX_BONUS',
                     ],
                 ],
+                'BONUS_ST' => [
+                    'header' => '店服务奖',
+                    'value' => function($row) {
+                        return (new Price([
+                            'value' => $row['BONUS_ST'],
+                        ]))->result();
+                    },
+                    'headerOther' => [
+                        'width' => '120',
+                        'prop'=>'BONUS_ST',
+                    ],
+                ],
+                'ORI_BONUS_ST' => [
+                    'header' => '店服务奖原金额',
+                    'value' => function($row) {
+                        return (new Price([
+                            'value' => $row['ORI_BONUS_ST'],
+                        ]))->result();
+                    },
+                    'headerOther' => [
+                        'width' => '120',
+                        'prop'=>'ORI_BONUS_ST',
+                    ],
+                ],
                 'BONUS_BD' => [
                     'header' => '服务奖',
                     'value' => function($row) {

frontendApi/modules/v1/controllers/BonusController.php

@@ -382,6 +382,10 @@ class BonusController extends BaseController {
                 $data[] = ['name' => '周共享奖金', 'value' => Tool::formatPrice($calcBonus['ORI_BONUS_GX'])];
                 $data[] = ['name' => '月共享奖金', 'value' => Tool::formatPrice($calcBonus['ORI_MONTH_GX_BONUS'])];
             }
+            if ($sysConfig['openStore']['VALUE']) {
+                // 店服务奖
+                $data[] = ['name' => '店服务奖金', 'value' => Tool::formatPrice($calcBonus['ORI_BONUS_ST'])];
+            }
             if ($sysConfig['openFW']['VALUE']) {
                 if (\Yii::$app->user->id == '670B84FD7C216D4EE055736AECE8644D') {
                     $data[] = ['name' => '服务奖金', 'value' => '0.00'];
@@ -463,7 +467,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,
+        ->select('ORI_BONUS_ST,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')
         ->limit($showBonusPeriodNum)
@@ -503,6 +507,10 @@ class BonusController extends BaseController {
                     $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['openStore']['VALUE']) {
+                    $calcBonus[$key]['BONUS_ST'] = ['name' => '店服务奖金', 'value' => Tool::formatPrice($calcBonus[$key]['ORI_BONUS_ST'])];
+                }
                 //服务奖
                 if ($sysConfig['openFW']['VALUE']) {
                     $calcBonus[$key]['BONUS_BD'] = ['name' => '服务奖金', 'value' => Tool::formatPrice($calcBonus[$key]['ORI_BONUS_BD'])];
@@ -570,10 +578,14 @@ class BonusController extends BaseController {
             // if ($sysConfig['openVIP']['VALUE']) {
             //     $tableKey[] = 'BONUS_VIP';
             // }
+            if ($sysConfig['openStore']['VALUE']) {
+                $tableKey[] = 'BONUS_ST';
+            }
             if ($sysConfig['openFW']['VALUE']) {
                 $tableKey[] = 'BONUS_BD';
             }
             
+            
             // if ($sysConfig['openXF']['VALUE']) {
             //     $tableKey[] = 'BONUS_XF';
             // }