memberBonusShowError

frontendApi/modules/v1/controllers/BonusController.php

@@ -519,117 +519,36 @@ class BonusController extends BaseController {
             'stockistCommissionSwitch' => intval($sysConfig['openFW']['VALUE']),
         ];
 
+        $result = [];
         foreach ($calcBonus as $key => $data) {
-            if($flowBonusSwitch) {
-                $calcBonus[$key]['PERIOD_NUM'] = ['name' => '期数', 'value' => $calcBonus[$key]['PERIOD_NUM']];
-                $calcBonus[$key]['LAST_DEC_NAME'] = ['name' => '级别', 'value' => Cache::getDecLevelConfig()[$calcBonus[$key]['LAST_DEC_LV']]['LEVEL_NAME']];
-                $calcBonus[$key]['LAST_EMP_NAME'] = ['name' => '聘级', 'value' => Cache::getEmpLevelConfig()[$calcBonus[$key]['LAST_EMP_LV']]['LEVEL_NAME']];
+            if ($flowBonusSwitch) {
+                $result[$key]['PERIOD_NUM'] = ['name' => '期数', 'value' => $data['PERIOD_NUM']];
+                $result[$key]['LAST_DEC_NAME'] = ['name' => '级别', 'value' => Cache::getDecLevelConfig()[$data['LAST_DEC_LV']]['LEVEL_NAME']];
+                $result[$key]['LAST_EMP_NAME'] = ['name' => '聘级', 'value' => Cache::getEmpLevelConfig()[$data['LAST_EMP_LV']]['LEVEL_NAME']];
 
                 // 销售奖金,就是原来的推广奖金
                 if ($sysConfig['openTG']['VALUE']) {
-                    $calcBonus[$key]['BONUS_TG'] = ['name' => '销售奖金', 'value' => Tool::formatPrice($calcBonus[$key]['ORI_BONUS_TG'])];
+                    $result[$key]['BONUS_TG'] = ['name' => '销售奖金', 'value' => Tool::formatPrice($data['ORI_BONUS_TG'])];
                 }
                 // 业绩奖金,就是原来的团队奖  并将业绩奖金改成绩效奖金
                 if ($sysConfig['openQY']['VALUE']) {
-                    $calcBonus[$key]['ORI_BONUS_QY'] = ['name' => '业绩奖金', 'value' => Tool::formatPrice($calcBonus[$key]['ORI_BONUS_QY'])];
+                    $result[$key]['ORI_BONUS_QY'] = ['name' => '业绩奖金', 'value' => Tool::formatPrice($data['ORI_BONUS_QY'])];
                 }
-
-                // 管理奖金 就是新的蓝星奖金
-//                $calcBonus[$key]['BONUS_BS'] = ['name' => '管理奖金', 'value' => Tool::formatPrice($calcBonus[$key]['ORI_BONUS_BS'])];
-                //共享奖
-//                if ($sysConfig['openGX']['VALUE']) {
-//                    $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'])];
+                    $result[$key]['BONUS_BD'] = ['name' => '服务奖金', 'value' => Tool::formatPrice($data['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'])];
-                $calcBonus[$key]['ORI_BONUS_BS_ABBR'] = ['name' => '绩效奖金', 'value' => Tool::formatPrice($calcBonus[$key]['ORI_BONUS_BS_ABBR'])];
-
-                $calcBonus[$key]['ORI_BONUS_QUARTER'] = ['name' => '季度奖金', 'value' => Tool::formatPrice($calcBonus[$key]['ORI_BONUS_QUARTER'] ?? 0)];
-//                $calcBonus[$key]['BONUS_TOURISM'] = ['name' => '旅游奖', 'value' => Tool::formatPrice($calcBonus[$key]['BONUS_TOURISM'])];
-//                $calcBonus[$key]['BONUS_GARAGE'] = ['name' => '车房奖', 'value' => Tool::formatPrice($calcBonus[$key]['BONUS_GARAGE'])];
-                // 总奖金
-                $calcBonus[$key]['BONUS_TOTAL'] = ['name' => '合计', 'value' => Tool::formatPrice($calcBonus[$key]['BONUS_TOTAL'])];
-//                $calcBonus[$key]['RECONSUME_POINTS'] = ['name' => '复销积分', 'value' => Tool::formatPrice($calcBonus[$key]['RECONSUME_POINTS'])];
-//                $calcBonus[$key]['EXCHANGE_POINTS'] = ['name' => '兑换积分', 'value' => Tool::formatPrice($calcBonus[$key]['EXCHANGE_POINTS'])];
-//                $calcBonus[$key]['MANAGE_TAX'] = ['name' => '管理费', 'value' => Tool::formatPrice($calcBonus[$key]['MANAGE_TAX'])];
-                $calcBonus[$key]['BONUS_REAL'] = ['name' => '实发奖金', 'value' => Tool::formatPrice($calcBonus[$key]['BONUS_REAL'])];
-                // if ($sysConfig['openYC']['VALUE']) {
-                //     $calcBonus[$key]['BONUS_YC'] = ['name' => '荣衔奖', 'value' => Tool::formatPrice($calcBonus[$key]['ORI_BONUS_YC'])];
-                // }
-                // if ($sysConfig['openVIP']['VALUE']) {
-                //     $calcBonus[$key]['BONUS_VIP'] = ['name' => 'VIP奖', 'value' => Tool::formatPrice($calcBonus[$key]['ORI_BONUS_VIP'])];
-                // }
-                // if ($sysConfig['openXF']['VALUE']) {
-                //     $calcBonus[$key]['BONUS_XF'] = ['name' => '消费奖', 'value' => Tool::formatPrice($calcBonus[$key]['ORI_BONUS_XF'])];
-                // }
-                // if ($sysConfig['openYJ']['VALUE']) {
-                //     $calcBonus[$key]['BONUS_YJ'] = ['name' => '业绩奖', 'value' => Tool::formatPrice($calcBonus[$key]['ORI_BONUS_YJ'])];
-                // }
-                // if ($sysConfig['openGL']['VALUE']) {
-                //     $calcBonus[$key]['BONUS_GL'] = ['name' => '管理奖', 'value' => Tool::formatPrice($calcBonus[$key]['ORI_BONUS_GL'])];
-                // }
-                // if ($sysConfig['openJXS']['VALUE']) {
-                //     $calcBonus[$key]['BONUS_STANDARD'] = ['name' => '团队成长奖', 'value' => Tool::formatPrice($calcBonus[$key]['ORI_BONUS_STANDARD'])];
-                // }
-            }else{
-
-                $calcBonus[$key]['BONUS_TOTAL'] = ['name' => '总奖金', 'value' => Tool::formatPrice($calcBonus[$key]['BONUS_TOTAL'])];
-
+                $result[$key]['ORI_BONUS_BS'] = ['name' => '管理奖金', 'value' => Tool::formatPrice($data['ORI_BONUS_BS'])];
+                $result[$key]['ORI_BONUS_BS_MNT'] = ['name' => '管理奖金', 'value' => Tool::formatPrice($data['ORI_BONUS_BS_MNT'])];
+                $result[$key]['ORI_BONUS_BS_ABBR'] = ['name' => '绩效奖金', 'value' => Tool::formatPrice($data['ORI_BONUS_BS_ABBR'])];
+                $result[$key]['ORI_BONUS_QUARTER'] = ['name' => '季度奖金', 'value' => Tool::formatPrice($data['ORI_BONUS_QUARTER'] ?? 0)];
+                $result[$key]['BONUS_TOTAL'] = ['name' => '合计', 'value' => Tool::formatPrice($data['BONUS_TOTAL'])];
+                $result[$key]['BONUS_REAL'] = ['name' => '实发奖金', 'value' => Tool::formatPrice($data['BONUS_REAL'])];
+            } else {
+                $result[$key]['BONUS_TOTAL'] = ['name' => '总奖金', 'value' => Tool::formatPrice($data['BONUS_TOTAL'])];
             }
         }
 
-//        if($flowBonusSwitch) {
-//            $tableKey[] = 'PERIOD_NUM';
-//            if ($sysConfig['openTG']['VALUE']) {
-//                $tableKey[] = 'BONUS_TG';
-//            }
-//            if ($sysConfig['openQY']['VALUE']) {
-//                $tableKey[] = 'BONUS_QY';
-//            }
-//            $tableKey[] = 'BONUS_BS';
-//            if ($sysConfig['openGX']['VALUE']) {
-//                $tableKey[] = 'BONUS_GX';
-//            }
-//            // if ($sysConfig['openYC']['VALUE']) {
-//            //     $tableKey[] = 'BONUS_YC';
-//            // }
-//            // if ($sysConfig['openVIP']['VALUE']) {
-//            //     $tableKey[] = 'BONUS_VIP';
-//            // }
-//            if ($sysConfig['openFW']['VALUE']) {
-//                $tableKey[] = 'BONUS_BD';
-//            }
-//
-//            // if ($sysConfig['openXF']['VALUE']) {
-//            //     $tableKey[] = 'BONUS_XF';
-//            // }
-//            // if ($sysConfig['openYJ']['VALUE']) {
-//            //     $tableKey[] = 'BONUS_YJ';
-//            // }
-//
-//            // if ($sysConfig['openGL']['VALUE']) {
-//            //     $tableKey[] = 'BONUS_GL';
-//            // }
-//            // if ($sysConfig['openJXS']['VALUE']) {
-//            //     $tableKey[] = 'BONUS_STANDARD';
-//            // }
-//
-//            $tableKey[] = 'BONUS_TOTAL';
-//            $tableKey[] = 'RECONSUME_POINTS';
-//            $tableKey[] = 'EXCHANGE_POINTS';
-//            $tableKey[] = 'MANAGE_TAX';
-//            $tableKey[] = 'BONUS_REAL';
-//        }else{
-//            $tableKey[] = 'BONUS_TOTAL';
-//        }
-
-        return static::notice(['tableData' => $calcBonus, 'tableKey' => '', 'bonusSwitch' => $bonusSwitch]);
+        return static::notice(['tableData' => $result, 'tableKey' => '', 'bonusSwitch' => $bonusSwitch]);
     }
 
     /**