自动计算和拉取相关

common/helpers/bonus/Calc/CalcConsole.php

@@ -149,6 +149,11 @@ class CalcConsole extends BaseBusiness
         $nowTs = time();
         $currentPeriod = Period::find()->where('START_TIME< :NOW_TIME',['NOW_TIME'=>$nowTs])->where('END_TIME>= :NOW_TIME',['NOW_TIME'=>$nowTs-6])->asArray()->one();
         $periodNum = $currentPeriod['PERIOD_NUM'];
+        $prevPeriodNum = $periodNum - 1;
+        $prevPeriod = Period::find()->where('PERIOD_NUM = :PERIOD_NUM',[':PERIOD_NUM'=>$prevPeriodNum])->asArray()->one();
+        if($prevPeriod['IS_SENT']==0){
+            return;
+        }
         if (
             Period::isPreparing($periodNum)
 //            || $currentPeriod['IS_MONTH'] == 0

common/models/Period.php

@@ -906,7 +906,9 @@ class Period extends \common\components\ActiveRecord
         }
         $period = static::findOneAsArray(['PERIOD_NUM' => $periodNum]);
         // 若计算服务中CALC_ID不为空，则不允许计算
-        if ($calcPeriod['CALC_ID']) return true;
+        if ($calcPeriod) {
+            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;