|
|
@@ -157,12 +157,17 @@ class CalcConsole extends BaseBusiness
|
|
|
}
|
|
|
|
|
|
$nowDate = date("d", $nowTs);
|
|
|
+ $nowHour = date("H", $nowTs);
|
|
|
$nowMin = date("i", $nowTs);
|
|
|
$nowSec = date("s", $nowTs);
|
|
|
if($nowDate >1 && $nowDate <= 15 || (($nowMin!=0 || $nowSec >= 5 ) || Period::isPreparing($periodNum)) ){ // 当不是整点小时,当计算中,不计算
|
|
|
return;
|
|
|
}
|
|
|
|
|
|
+ if (($nowTs + 86400 < $currentPeriod['END_TIME']) && $nowHour > 0) {
|
|
|
+ return;
|
|
|
+ }
|
|
|
+
|
|
|
print_r($periodNum."该预结算".$nowMin.PHP_EOL.$nowSec);
|
|
|
|
|
|
//设置计算进行中标识
|