Merge branch 'feature/2552-switch-5-second-pull'

# Conflicts:
#	common/helpers/bonus/Calc/CalcConsole.php

backendApi/modules/v1/controllers/CalcController.php

@@ -50,6 +50,8 @@ class CalcController extends BaseController
         if ($formModel->load(Yii::$app->request->get(), '') && $formModel->autoPerf()) {
             //设置预计算进行中标识
             Period::updatePeriodIsPreparing($periodNum, Period::IS_PREPARING);
+            //设置redis开关
+            Yii::$app->cache->set('isPreparing', 1, 3600);
             return static::notice('预计算已开始，请等待');
         } else {
             return static::notice(Form::formatErrorsForApi($formModel->getErrors()), 400);
@@ -83,6 +85,8 @@ class CalcController extends BaseController
         $formModel->scenario = 'perf';
 
         if ($formModel->load(Yii::$app->request->get(), '') && $formModel->autoExec()) {
+            //设置redis开关
+            Yii::$app->cache->set('isCalcing', 1, 3600);
             return static::notice('自动计算已开始，请等待');
         } else {
             return static::notice(Form::formatErrorsForApi($formModel->getErrors()), 400);
@@ -112,6 +116,8 @@ class CalcController extends BaseController
         $formModel->scenario = 'perf';
 
         if ($formModel->load(Yii::$app->request->get(), '') && $formModel->generatePerfOrder()) {
+            //设置redis开关
+            Yii::$app->cache->set('isCalcing', 1, 3600);
             return static::notice('业绩单已开始生成，请等待');
         } else {
             Period::updatePeriodIsProcessing($periodNum, Period::NOT_PROCESSING);

common/helpers/bonus/Calc/BaseBusiness.php

@@ -46,7 +46,7 @@ class BaseBusiness
         if (empty($periodNum) || !is_numeric($periodNum)) {
             return 0;
         }
-        $db = self::CALC_DB_NAME;
+        $db = CalcConsole::CALC_DB_NAME;
         //同步字段去掉 IS_CALCULATED, 否则自动拉取的轮询间隔之间奖金计算完成后更新该字段则会认为已经拉取过奖金数据
         $period = \Yii::$app->$db->createCommand("SELECT 
                 PERIOD_NUM,

common/helpers/bonus/Calc/CalcConsole.php

@@ -3,6 +3,7 @@
 namespace common\helpers\bonus\Calc;
 
 
+use common\helpers\Cache;
 use common\helpers\Form;
 use common\models\CalcRecord;
 use common\models\forms\PeriodForm;
@@ -23,6 +24,11 @@ class CalcConsole extends BaseBusiness
      */
     public static function listenCalcPeriod()
     {
+        // 先检查redis的开关
+        $calcingSwitch = Yii::$app->cache->get('isCalcing') ? 1 : 0;
+        if(!$calcingSwitch){
+            return true;
+        }
         $db        = self::CALC_DB_NAME;
         $allPeriod = \Yii::$app->$db->createCommand("SELECT * FROM AR_PERIOD order by PERIOD_NUM desc")->queryAll();
         $period    = [];
@@ -110,6 +116,8 @@ class CalcConsole extends BaseBusiness
                 self::pullPeriodForUpdate($period['PERIOD_NUM']);
                 //拉取计算系统的进度日志
                 self::syncLogRecord($period['PERIOD_NUM'], $db, $startExecTime);
+                //设置redis开关
+                Yii::$app->cache->set('isCalcing', 0);
             } else {
                 //结束计算状态
                 Period::updatePeriodIsProcessing($period['PERIOD_NUM'], Period::NOT_PROCESSING);
@@ -150,6 +158,8 @@ class CalcConsole extends BaseBusiness
 
             if($formModel->load(['periodNum'=>$periodNum], '') && $formModel->autoPrePerf()) {
                 echo('自动计算已开始，请等待'.PHP_EOL);
+                //设置redis开关
+                Yii::$app->cache->set('isPreparing', 1, 3600);
                 CalcRecord::record($periodNum, '【定时计算】第' . $periodNum . '期，定时计算开始');
             } else {
                 echo('自动计算未开始'.PHP_EOL);
@@ -163,6 +173,11 @@ class CalcConsole extends BaseBusiness
 
     public static function listenAutoPerfPeriod() // 拉取预结算的结果
     {
+        // 先检查redis的开关
+        $preparingSwitch = Yii::$app->cache->get('isPreparing') ? 1 : 0;
+        if(!$preparingSwitch){
+            return true;
+        }
         $db        = self::CALC_DB_NAME;
         $allPeriod = \Yii::$app->$db->createCommand("SELECT * FROM AR_PERIOD order by PERIOD_NUM desc")->queryAll();
         $period    = [];
@@ -200,6 +215,7 @@ class CalcConsole extends BaseBusiness
                 Period::updatePeriodIsPreparing($period['PERIOD_NUM'], Period::NOT_PREPARING);
                 CalcRecord::record($period['PERIOD_NUM'], '【期业绩】第' . $period['PERIOD_NUM'] . '期的预计算期业绩数据已获取');
                 self::syncLogRecord($period['PERIOD_NUM'], $db, $startExecTime);
+                Yii::$app->cache->set('isPreparing', 0);
                 return $res;
             } else {
                 //结束计算状态

common/models/Period.php

@@ -2,6 +2,7 @@
 
 namespace common\models;
 
+use common\helpers\bonus\Calc\CalcConsole;
 use common\helpers\Date;
 use common\helpers\Tool;
 use Yii;
@@ -894,7 +895,18 @@ class Period extends \common\components\ActiveRecord
      */
     public static function isProcessing($periodNum = null): bool
     {
+        $db        = CalcConsole::CALC_DB_NAME;
+        $allPeriod = \Yii::$app->$db->createCommand("SELECT * FROM AR_PERIOD order by PERIOD_NUM desc")->queryAll();
+        $calcPeriod    = [];
+        foreach ($allPeriod as $v) {
+            if ($v['IS_PREPARE'] > 0) {
+                $calcPeriod = $v;
+                break;
+            }
+        }
         $period = static::findOneAsArray(['PERIOD_NUM' => $periodNum]);
+        // 若计算服务中CALC_ID不为空，则不允许计算
+        if ($calcPeriod['CALC_ID']) return true;
         //挂网则拒绝操作，返回true则拒绝操作
         if ($period['IS_SENT'] == self::SEND_FINISH) return true;
         if ($period['IS_PROCESSING'] == self::IS_PROCESSING) return true;