往期奖金

frontendApi/modules/v1/controllers/BonusController.php

@@ -235,56 +235,71 @@ class BonusController extends BaseController {
             $data[] = ['name' => '期数', 'value' => $periodNum];
             $data[] = ['name' => '级别', 'value' => Cache::getDecLevelConfig()[$calcBonus['LAST_DEC_LV']]['LEVEL_NAME']];
             $data[] = ['name' => '荣誉', 'value' => Cache::getEmpLevelConfig()[$calcBonus['LAST_EMP_LV']]['LEVEL_NAME']];
-            if ($sysConfig['openQY']['VALUE']) {
-                $data[] = ['name' => '团队奖', 'value' => Tool::formatPrice($calcBonus['ORI_BONUS_QY'])];
-            }
-            if ($sysConfig['openYC']['VALUE']) {
-                $data[] = ['name' => '荣衔奖', 'value' => Tool::formatPrice($calcBonus['ORI_BONUS_YC'])];
-            }
-            if ($sysConfig['openVIP']['VALUE']) {
-                $data[] = ['name' => 'VIP奖', 'value' => Tool::formatPrice($calcBonus['ORI_BONUS_VIP'])];
-            }
-            if ($sysConfig['openFW']['VALUE']) {
-                $data[] = ['name' => '服务奖', 'value' => Tool::formatPrice($calcBonus['ORI_BONUS_BD'])];
-            }
             if ($sysConfig['openTG']['VALUE']) {
-                $data[] = ['name' => '推广奖', 'value' => Tool::formatPrice($calcBonus['ORI_BONUS_TG'])];
-            }
-            if ($sysConfig['openXF']['VALUE']) {
-                $data[] = ['name' => '消费奖', 'value' => Tool::formatPrice($calcBonus['ORI_BONUS_XF'])];
+                // 销售奖金 就是 原来的推广奖
+                $data[] = ['name' => '销售奖金', 'value' => Tool::formatPrice($calcBonus['ORI_BONUS_TG'])];
             }
-            if ($sysConfig['openYJ']['VALUE']) {
-                $data[] = ['name' => '业绩奖', 'value' => Tool::formatPrice($calcBonus['ORI_BONUS_YJ'])];
+            if ($sysConfig['openQY']['VALUE']) {
+                // 业绩奖金  就是原来的团队奖
+                // $data[] = ['name' => '团队奖', 'value' => Tool::formatPrice($calcBonus['ORI_BONUS_QY'])];
+                $data[] = ['name' => '业绩奖金', 'value' => Tool::formatPrice($calcBonus['ORI_BONUS_QY'])];
             }
+            // 管理奖金 就是新的蓝星奖
+            $data[] = ['name' => '管理奖金', 'value' => Tool::formatPrice($calcBonus['ORI_BONUS_BS'])];
             if ($sysConfig['openGX']['VALUE']) {
-                $data[] = ['name' => '共享奖', 'value' => Tool::formatPrice($calcBonus['ORI_BONUS_GX'])];
-            }
-            if ($sysConfig['openGL']['VALUE']) {
-                $data[] = ['name' => '管理奖', 'value' => Tool::formatPrice($calcBonus['ORI_BONUS_GL'])];
+                $data[] = ['name' => '共享奖金', 'value' => Tool::formatPrice($calcBonus['ORI_BONUS_GX'])];
             }
-            $data[] = ['name' => '蓝星管理奖', 'value' => Tool::formatPrice($calcBonus['ORI_BONUS_BS'])];
-            if ($sysConfig['openJXS']['VALUE']) {
-                $data[] = ['name' => '团队成长奖', 'value' => Tool::formatPrice($calcBonus['ORI_BONUS_STANDARD'])];
+            if ($sysConfig['openFW']['VALUE']) {
+                $data[] = ['name' => '服务奖金', 'value' => Tool::formatPrice($calcBonus['ORI_BONUS_BD'])];
             }
-//        if($sysConfig['openLS']['VALUE']) {
-//            $data[] = ['name' => '零售奖', 'value' => Tool::formatPrice($calcBonus['BONUS_LS'])];
-//        }
-//        $data[]=['name'=>'责任业绩扣除','value'=>Tool::formatPrice($calcBonus['DEDUCT_ZR'])];
             $data[] = ['name' => '总奖金', 'value' => Tool::formatPrice($calcBonus['BONUS_TOTAL'])];
             $data[] = ['name' => '管理费', 'value' => Tool::formatPrice($calcBonus['MANAGE_TAX'])];
             $data[] = ['name' => '实发奖金', 'value' => Tool::formatPrice($calcBonus['BONUS_REAL'])];
-//        $data[]=['name'=>'总奖金','value'=>Tool::formatPrice($calcBonus['BONUS_TOTAL'])];
             $data[] = ['name' => '复消积分', 'value' => Tool::formatPrice($calcBonus['RECONSUME_POINTS'])];
             $data[] = ['name' => '兑换积分', 'value' => Tool::formatPrice($calcBonus['EXCHANGE_POINTS'])];
-//        if($sysConfig['openLX']['VALUE']) {
-//            $data[] = ['name' => '福利积分二', 'value' => Tool::formatPrice($calcBonus['BONUS_LX'])];
-//        }
             $data[] = ['name' => '一市场新增业绩', 'value' => Tool::formatFrontPerf($calcBonus['PV_1L'])];
             $data[] = ['name' => '二市场新增业绩', 'value' => Tool::formatFrontPerf($calcBonus['PV_2L'])];
             $data[] = ['name' => '三市场新增业绩', 'value' => Tool::formatFrontPerf($calcBonus['PV_3L'])];
             $data[] = ['name' => '一市场结余业绩', 'value' => Tool::formatFrontPerf($calcBonus['SURPLUS_1L'])];
             $data[] = ['name' => '二市场结余业绩', 'value' => Tool::formatFrontPerf($calcBonus['SURPLUS_2L'])];
             $data[] = ['name' => '三市场结余业绩', 'value' => Tool::formatFrontPerf($calcBonus['SURPLUS_3L'])];
+
+
+
+            // if ($sysConfig['openYC']['VALUE']) {
+            //     $data[] = ['name' => '荣衔奖', 'value' => Tool::formatPrice($calcBonus['ORI_BONUS_YC'])];
+            // }
+            // if ($sysConfig['openVIP']['VALUE']) {
+            //     $data[] = ['name' => 'VIP奖', 'value' => Tool::formatPrice($calcBonus['ORI_BONUS_VIP'])];
+            // }
+            
+            
+            // if ($sysConfig['openXF']['VALUE']) {
+            //     $data[] = ['name' => '消费奖', 'value' => Tool::formatPrice($calcBonus['ORI_BONUS_XF'])];
+            // }
+            // if ($sysConfig['openYJ']['VALUE']) {
+            //     $data[] = ['name' => '业绩奖', 'value' => Tool::formatPrice($calcBonus['ORI_BONUS_YJ'])];
+            // }
+            
+            // if ($sysConfig['openGL']['VALUE']) {
+            //     $data[] = ['name' => '管理奖', 'value' => Tool::formatPrice($calcBonus['ORI_BONUS_GL'])];
+            // }
+            
+            // if ($sysConfig['openJXS']['VALUE']) {
+            //     $data[] = ['name' => '团队成长奖', 'value' => Tool::formatPrice($calcBonus['ORI_BONUS_STANDARD'])];
+            // }
+//        if($sysConfig['openLS']['VALUE']) {
+//            $data[] = ['name' => '零售奖', 'value' => Tool::formatPrice($calcBonus['BONUS_LS'])];
+//        }
+//        $data[]=['name'=>'责任业绩扣除','value'=>Tool::formatPrice($calcBonus['DEDUCT_ZR'])];
+            
+            
+//        $data[]=['name'=>'总奖金','value'=>Tool::formatPrice($calcBonus['BONUS_TOTAL'])];
+            
+//        if($sysConfig['openLX']['VALUE']) {
+//            $data[] = ['name' => '福利积分二', 'value' => Tool::formatPrice($calcBonus['BONUS_LX'])];
+//        }
+            
 //        $data[]=['name'=>'四市场新增业绩','value'=>Tool::formatFrontPerf($calcBonus['PV_4L'])];
 //        $data[]=['name'=>'五市场新增业绩','value'=>Tool::formatFrontPerf($calcBonus['PV_5L'])];
 //        $data[]=['name'=>'虚拟市场新增业绩','value'=>Tool::formatFrontPerf($calcBonus['PV_LS_TOUCH'])];
@@ -328,42 +343,48 @@ class BonusController extends BaseController {
                 $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 ($sysConfig['openQY']['VALUE']) {
-                    $calcBonus[$key]['BONUS_QY'] = ['name' => '团队奖', 'value' => Tool::formatPrice($calcBonus[$key]['ORI_BONUS_QY'])];
-                }
-                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['openFW']['VALUE']) {
-                    $calcBonus[$key]['BONUS_BD'] = ['name' => '服务奖', 'value' => Tool::formatPrice($calcBonus[$key]['ORI_BONUS_BD'])];
-                }
+                // 销售奖金,就是原来的推广奖金
                 if ($sysConfig['openTG']['VALUE']) {
-                    $calcBonus[$key]['BONUS_TG'] = ['name' => '推广奖', 'value' => Tool::formatPrice($calcBonus[$key]['ORI_BONUS_TG'])];
-                }
-                if ($sysConfig['openXF']['VALUE']) {
-                    $calcBonus[$key]['BONUS_XF'] = ['name' => '消费奖', 'value' => Tool::formatPrice($calcBonus[$key]['ORI_BONUS_XF'])];
+                    $calcBonus[$key]['BONUS_TG'] = ['name' => '销售奖金', 'value' => Tool::formatPrice($calcBonus[$key]['ORI_BONUS_TG'])];
                 }
-                if ($sysConfig['openYJ']['VALUE']) {
-                    $calcBonus[$key]['BONUS_YJ'] = ['name' => '业绩奖', 'value' => Tool::formatPrice($calcBonus[$key]['ORI_BONUS_YJ'])];
+                // 业绩奖金,就是原来的团队奖
+                if ($sysConfig['openQY']['VALUE']) {
+                    $calcBonus[$key]['BONUS_QY'] = ['name' => '业绩奖金', 'value' => Tool::formatPrice($calcBonus[$key]['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'])];
+                    $calcBonus[$key]['BONUS_GX'] = ['name' => '共享奖金', 'value' => Tool::formatPrice($calcBonus[$key]['ORI_BONUS_GX'])];
                 }
-                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'])];
+                //服务奖
+                if ($sysConfig['openFW']['VALUE']) {
+                    $calcBonus[$key]['BONUS_BD'] = ['name' => '服务奖金', 'value' => Tool::formatPrice($calcBonus[$key]['ORI_BONUS_BD'])];
                 }
-                $calcBonus[$key]['BONUS_BS'] = ['name' => '蓝星管理奖', 'value' => Tool::formatPrice($calcBonus[$key]['ORI_BONUS_BS'])];
+                // 总奖金
                 $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'])];
-                $calcBonus[$key]['RECONSUME_POINTS'] = ['name' => '复消积分', 'value' => Tool::formatPrice($calcBonus[$key]['RECONSUME_POINTS'])];
-                $calcBonus[$key]['EXCHANGE_POINTS'] = ['name' => '兑换积分', 'value' => Tool::formatPrice($calcBonus[$key]['EXCHANGE_POINTS'])];
+                // 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'])];
@@ -373,37 +394,38 @@ class BonusController extends BaseController {
 
         if($flowBonusSwitch) {
             $tableKey[] = 'PERIOD_NUM';
+            if ($sysConfig['openTG']['VALUE']) {
+                $tableKey[] = 'BONUS_TG';
+            }
             if ($sysConfig['openQY']['VALUE']) {
                 $tableKey[] = 'BONUS_QY';
             }
-            if ($sysConfig['openYC']['VALUE']) {
-                $tableKey[] = 'BONUS_YC';
-            }
-            if ($sysConfig['openVIP']['VALUE']) {
-                $tableKey[] = 'BONUS_VIP';
-            }
+            // if ($sysConfig['openYC']['VALUE']) {
+            //     $tableKey[] = 'BONUS_YC';
+            // }
+            // if ($sysConfig['openVIP']['VALUE']) {
+            //     $tableKey[] = 'BONUS_VIP';
+            // }
             if ($sysConfig['openFW']['VALUE']) {
                 $tableKey[] = 'BONUS_BD';
             }
-            if ($sysConfig['openTG']['VALUE']) {
-                $tableKey[] = 'BONUS_TG';
-            }
-            if ($sysConfig['openXF']['VALUE']) {
-                $tableKey[] = 'BONUS_XF';
-            }
-            if ($sysConfig['openYJ']['VALUE']) {
-                $tableKey[] = 'BONUS_YJ';
-            }
+            
+            // if ($sysConfig['openXF']['VALUE']) {
+            //     $tableKey[] = 'BONUS_XF';
+            // }
+            // if ($sysConfig['openYJ']['VALUE']) {
+            //     $tableKey[] = 'BONUS_YJ';
+            // }
             if ($sysConfig['openGX']['VALUE']) {
                 $tableKey[] = 'BONUS_GX';
             }
-            if ($sysConfig['openGL']['VALUE']) {
-                $tableKey[] = 'BONUS_GL';
-            }
-            if ($sysConfig['openJXS']['VALUE']) {
-                $tableKey[] = 'BONUS_STANDARD';
-            }
-            $tableKey[] = 'BONUS_BS';
+            // if ($sysConfig['openGL']['VALUE']) {
+            //     $tableKey[] = 'BONUS_GL';
+            // }
+            // if ($sysConfig['openJXS']['VALUE']) {
+            //     $tableKey[] = 'BONUS_STANDARD';
+            // }
+            // $tableKey[] = 'BONUS_BS';
             $tableKey[] = 'BONUS_TOTAL';
             $tableKey[] = 'RECONSUME_POINTS';
             $tableKey[] = 'EXCHANGE_POINTS';