Merge branch 'bugfixed/bus_calc_server_fix'

common/helpers/bonus/Calc/CalcConsole.php

@@ -13,19 +13,19 @@ class CalcConsole extends BaseBusiness
     public static function listenCalcPeriod()
     {
         $db        = self::CALC_DB_NAME;
-        $allPeriod = \Yii::$app->$db->createCommand("SELECT * FROM AR_PERIOD ")->queryAll();
+        $allPeriod = \Yii::$app->$db->createCommand("SELECT * FROM AR_PERIOD order by PERIOD_NUM desc")->queryAll();
         $period    = [];
         foreach ($allPeriod as $v) {
             if ($v['IS_PREPARE'] > 0
-                //&& todo 补全状态
+                && $v['IS_SENT'] === 0 //未挂网
             ) {
                 $period = $v;
                 break;
             }
         }
-if (empty($period)){
-    return true;
-}
+        if (empty($period)){
+            return true;
+        }
         $businessPeriod = Period::find()->where(['PERIOD_NUM' => $period['PERIOD_NUM']])
             ->asArray()->one();
         //用户选择是否自动执行