zxiansheng 4 лет назад
Родитель
Сommit
8203e93daf

+ 1 - 1
common/helpers/bonus/PerfCalc.php

@@ -188,7 +188,7 @@ class PerfCalc {
             $this->_updatePercent(100);
             $t10 = microtime(true);
 
-            echo('结算全部完成,共耗时:' . round($t10 - $t9, 3) . ',内存使用:' . (round(memory_get_usage() / 1024 / 1024, 3)) . 'MB' . PHP_EOL);
+            echo('业绩结算全部完成,共耗时:' . round($t10 - $t9, 3) . ',内存使用:' . (round(memory_get_usage() / 1024 / 1024, 3)) . 'MB' . PHP_EOL);
         } catch (\Exception $e) {
             $this->errorCalcTask();
             $this->addError('calc', $e->getMessage());

+ 6 - 4
frontendApi/modules/v1/controllers/BonusController.php

@@ -400,6 +400,10 @@ class BonusController extends BaseController {
             if ($sysConfig['openQY']['VALUE']) {
                 $tableKey[] = 'BONUS_QY';
             }
+            $tableKey[] = 'BONUS_BS';
+            if ($sysConfig['openGX']['VALUE']) {
+                $tableKey[] = 'BONUS_GX';
+            }
             // if ($sysConfig['openYC']['VALUE']) {
             //     $tableKey[] = 'BONUS_YC';
             // }
@@ -416,16 +420,14 @@ class BonusController extends BaseController {
             // 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';
+           
             $tableKey[] = 'BONUS_TOTAL';
             $tableKey[] = 'RECONSUME_POINTS';
             $tableKey[] = 'EXCHANGE_POINTS';