This commit is contained in:
aozhiwei 2024-10-11 10:57:29 +08:00
parent f2e30a4270
commit 0af21b58cf
2 changed files with 13 additions and 1 deletions

View File

@ -98,6 +98,16 @@ class BaseController {
return phpcommon\getThisMonthFirstDaySeconds($time, $this->timeZone); return phpcommon\getThisMonthFirstDaySeconds($time, $this->timeZone);
} }
public function _getNextMonthFirstDaySeconds()
{
return phpcommon\getNextMonthFirstDaySeconds($this->_getNowTime(), $this->timeZone);
}
public function _getNextMonthFirstDaySecondsByTime($time)
{
return phpcommon\getNextMonthFirstDaySeconds($time, $this->timeZone);
}
public function _inTimeRangeStr($beginTimeStr, $endTimeStr) public function _inTimeRangeStr($beginTimeStr, $endTimeStr)
{ {
$beginTimeOffset = myself()->_getDaySecondsOffset(strtotime("2024-6-22 ". $beginTimeStr)); $beginTimeOffset = myself()->_getDaySecondsOffset(strtotime("2024-6-22 ". $beginTimeStr));

View File

@ -41,7 +41,9 @@ class HashRateShopBuyRecord extends BaseModel
$row['this_week_buy_times'] = 0; $row['this_week_buy_times'] = 0;
} }
$monthFirstDaySeconds = myself()->_getMonthFirstDaySeconds(); $monthFirstDaySeconds = myself()->_getMonthFirstDaySeconds();
if (!($row['last_buy_time'] >= $monthFirstDaySeconds && $row['last_buy_time'] <= $monthFirstDaySeconds)) { $nextMonthFirstDaySeconds = myself()->_getNextMonthFirstDaySeconds();
if (!($row['last_buy_time'] >= $monthFirstDaySeconds &&
$row['last_buy_time'] <= $nextMonthFirstDaySeconds)) {
$row['this_month_buy_times'] = 0; $row['this_month_buy_times'] = 0;
} }
return $row; return $row;