Bladeren bron

共享将保留

zxiansheng 4 jaren geleden
bovenliggende
commit
d4adc39d20
2 gewijzigde bestanden met toevoegingen van 10 en 10 verwijderingen
  1. 9 9
      common/helpers/bonus/BonusCalc.php
  2. 1 1
      common/helpers/bonus/PerfCalc.php

+ 9 - 9
common/helpers/bonus/BonusCalc.php

@@ -226,13 +226,13 @@ class BonusCalc extends BaseObject {
             echo('计算团队奖'.($this->_sysConfig['openQY']['VALUE']?'完成':'关闭').',耗时:' . round($t9 - $t8, 3) . ',内存使用:' . (round(memory_get_usage() / 1024 / 1024, 3)) . 'MB' . PHP_EOL);
             $this->_updatePercent(65);
 
-            // if($this->_sysConfig['openGX']['VALUE']) {
-            //     $this->calcBonusGXBefore();
-            //     $this->calcBonusGX();
-            // }
-            // $t11 = microtime(true);
-            // echo('计算共享奖'.($this->_sysConfig['openGX']['VALUE']?'完成':'关闭').',耗时:' . round($t11 - $t9, 3) . ',内存使用:' . (round(memory_get_usage() / 1024 / 1024, 3)) . 'MB' . PHP_EOL);
-            // $this->_updatePercent(45);
+            if($this->_sysConfig['openGX']['VALUE']) {
+                $this->calcBonusGXBefore();
+                $this->calcBonusGX();
+            }
+            $t11 = microtime(true);
+            echo('计算共享奖'.($this->_sysConfig['openGX']['VALUE']?'完成':'关闭').',耗时:' . round($t11 - $t9, 3) . ',内存使用:' . (round(memory_get_usage() / 1024 / 1024, 3)) . 'MB' . PHP_EOL);
+            $this->_updatePercent(68);
 
             // if($this->_sysConfig['openGL']['VALUE']) {
             //     $this->calcBonusBdGL();
@@ -249,8 +249,8 @@ class BonusCalc extends BaseObject {
 //            $this->_updatePercent(70);
 
             // if($this->_sysConfig['openYC']['VALUE']) {
-            //     $this->calcBonusYCStepOne();
-            //     $this->calcBonusYCStepTwo();
+                // $this->calcBonusYCStepOne();
+                // $this->calcBonusYCStepTwo();
             // }
             // $t16 = microtime(true);
             // echo('计算荣衔奖'.($this->_sysConfig['openYC']['VALUE']?'完成':'关闭').',耗时:' . round($t16 - $t13, 3) . ',内存使用:' . (round(memory_get_usage() / 1024 / 1024, 3)) . 'MB' . PHP_EOL);

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

@@ -162,7 +162,7 @@ class PerfCalc {
             //每月计算聘级
             // modify 聘级字段改成蓝星奖的  奖衔级别(蓝星奖的等级).不在使用荣衔奖金.聘级的等级切换成蓝星奖等级,
             // 此等级会影响团队将的封顶.
-            //$this->loopCalcEmpLevel();
+            // $this->loopCalcEmpLevel();
             $t8 = microtime(true);
             echo('计算聘级完成,耗时:' . round($t8 - $t7, 3) . ',内存使用:' . (round(memory_get_usage() / 1024 / 1024, 3)) . 'MB' . PHP_EOL);
             //$this->_updatePercent(90);