1773 会员端奖项补充

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

@@ -474,30 +474,30 @@ class PeriodBonusList extends \common\libs\dataList\DataList implements DataList
 //                        'prop'=>'REAL_BONUS_GX',
 //                    ],
 //                ],
-//                'BONUS_BD' => [
-//                    'header' => '服务奖',
-//                    'value' => function($row) {
-//                        return (new Price([
-//                            'value' => $row['BONUS_BD'],
-//                        ]))->result();
-//                    },
-//                    'headerOther' => [
-//                        'width' => '120',
-//                        'prop'=>'BONUS_BD',
-//                    ],
-//                ],
-//                'ORI_BONUS_BD' => [
-//                    'header' => '服务奖原金额',
-//                    'value' => function($row) {
-//                        return (new Price([
-//                            'value' => $row['ORI_BONUS_BD'],
-//                        ]))->result();
-//                    },
-//                    'headerOther' => [
-//                        'width' => '120',
-//                        'prop'=>'ORI_BONUS_BD',
-//                    ],
-//                ],
+                'BONUS_BD' => [
+                    'header' => 'Stockist Commission',// 服务奖
+                    'value' => function($row) {
+                        return (new Price([
+                            'value' => $row['BONUS_BD'],
+                        ]))->result();
+                    },
+                    'headerOther' => [
+                        'width' => '120',
+                        'prop'=>'BONUS_BD',
+                    ],
+                ],
+                'ORI_BONUS_BD' => [
+                    'header' => 'Original amount of Stockist Commission',//服务奖原金额
+                    'value' => function($row) {
+                        return (new Price([
+                            'value' => $row['ORI_BONUS_BD'],
+                        ]))->result();
+                    },
+                    'headerOther' => [
+                        'width' => '120',
+                        'prop'=>'ORI_BONUS_BD',
+                    ],
+                ],
                 'BONUS_REAL' => [
                     'header' => 'Actual Bonus',//实发奖金
                     'value' => function($row) {
@@ -765,7 +765,7 @@ class PeriodBonusList extends \common\libs\dataList\DataList implements DataList
                 'SURPLUS_2L'=> ['isUserTable'=> false, 'name'=> 'II. market balance performance'],//二市场结余业绩
 //                'PV_3L'=> ['isUserTable'=> false, 'name'=> 'III. new market performance'],//三市场新增业绩
 //                'SURPLUS_3L'=> ['isUserTable'=> false, 'name'=> 'III. market balance performance'],//三市场结余业绩
-                'BONUS_BD'=> ['isUserTable'=> false, 'name'=> 'Service Award'],//服务奖
+                'BONUS_BD'=> ['isUserTable'=> false, 'name'=> 'Stockist Commission'],//服务奖
 //                'BONUS_TG'=> ['isUserTable'=> false, 'name'=> 'Promotion Award'],//推广奖
 //                'BONUS_XF'=> ['isUserTable'=> false, 'name'=> 'Consumption Award'],//消费奖
 //                'BONUS_YJ'=> ['isUserTable'=> false, 'name'=> 'Performance Award'],//业绩奖

frontendApi/modules/v1/controllers/BonusController.php

@@ -388,9 +388,9 @@ class BonusController extends BaseController {
 //                    $calcBonus[$key]['BONUS_GX'] = ['name' => '共享奖金', 'value' => Tool::formatPrice($calcBonus[$key]['ORI_BONUS_GX'])];
 //                }
                 //服务奖
-//                if ($sysConfig['openFW']['VALUE']) {
-//                    $calcBonus[$key]['BONUS_BD'] = ['name' => '服务奖金', 'value' => Tool::formatPrice($calcBonus[$key]['ORI_BONUS_BD'])];
-//                }
+                if ($sysConfig['openFW']['VALUE']) {
+                    $calcBonus[$key]['BONUS_BD'] = ['name' => '服务奖金', 'value' => Tool::formatPrice($calcBonus[$key]['ORI_BONUS_BD'])];
+                }
                 // 管理奖金 就是新的蓝星奖
                 $calcBonus[$key]['ORI_BONUS_BS'] = ['name' => '管理奖金', 'value' => Tool::formatPrice($calcBonus[$key]['ORI_BONUS_BS'])];
                 $calcBonus[$key]['ORI_BONUS_BS_MNT'] = ['name' => '管理奖金', 'value' => Tool::formatPrice($calcBonus[$key]['ORI_BONUS_BS_MNT'])];

frontendEle/src/views/bonus/other.vue

@@ -12,6 +12,8 @@
         </el-table-column>
         <el-table-column label="Quarterly Bonus" prop="ORI_BONUS_QUARTER.value" width="170"><!-- 季度分红 -->
         </el-table-column>
+        <el-table-column label="Stockist Commission" prop="ORI_BONUS_BD.value" width="170"><!-- 季度分红 -->
+        </el-table-column>
         <el-table-column label="Total Bonus" prop="BONUS_TOTAL.value" width="170"><!-- 合计 -->
         </el-table-column>
         <el-table-column label="Actual Bonus" prop="BONUS_REAL.value" width="170"><!-- 实发 -->