Merge branch 'master' into feature/2703-biopure-ultra-3

# Conflicts:
#	common/models/Period.php

common/config/main.php

@@ -12,7 +12,8 @@ if (YII_ENV == YII_ENV_DEV) {
 }
 
 return [
-    'language' => 'en-US', // zh-CN
+    'language' => 'zh-CN', // zh-CN 目标语言
+    'sourceLanguage' => 'en-US',
     'timeZone' => 'Africa/Lagos',
     'aliases' => [
         '@bower' => '@vendor/bower-asset',
@@ -89,7 +90,7 @@ return [
                 'app*' => [
                     'class' => 'yii\i18n\PhpMessageSource',
                     'basePath' => '@common/messages',
-                    'sourceLanguage' => 'en-US',
+//                    'sourceLanguage' => 'en-US',
                     'fileMap' => [
                         'app' => 'app.php',
                         'app/error' => 'error.php',

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

frontendApi/modules/v1/controllers/BaseController.php

@@ -111,9 +111,9 @@ class BaseController extends \yii\rest\ActiveController {
 
         // 动态返回语言：zh:zh-CN | en:en-US
         if (!Yii::$app->request->isOptions) {
-            if (Yii::$app->request->headers->get('language')) {
-                Yii::$app->language = Yii::$app->request->headers->get('language') == 'zh' ? 'zh-CN' : 'en-US';
-            }
+            $language = Yii::$app->request->headers->get('language') ?? 'en';
+            Yii::$app->language = $language == 'zh' ? 'zh-CN' : 'en-US';
+            Yii::$app->sourceLanguage = $language == 'zh' ? 'en-US' : 'zh-CN';
         }
 
         return parent::beforeAction($action);