theo vor 2 Jahren
Ursprung
Commit
e0bfcd350f
2 geänderte Dateien mit 13 neuen und 1 gelöschten Zeilen
  1. 1 1
      common/helpers/bonus/Calc/BaseBusiness.php
  2. 12 0
      common/models/Period.php

+ 1 - 1
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,

+ 12 - 0
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;