From a14072433cf3c5288e8f44f822daf87512c95167 Mon Sep 17 00:00:00 2001 From: aozhiwei Date: Thu, 10 Oct 2024 15:38:40 +0800 Subject: [PATCH] 1 --- webapp/models/HashRateShopBuyRecord.php | 8 ++++++-- 1 file changed, 6 insertions(+), 2 deletions(-) diff --git a/webapp/models/HashRateShopBuyRecord.php b/webapp/models/HashRateShopBuyRecord.php index 5e4ad9b0..b37dcbdb 100644 --- a/webapp/models/HashRateShopBuyRecord.php +++ b/webapp/models/HashRateShopBuyRecord.php @@ -39,6 +39,10 @@ class HashRateShopBuyRecord extends BaseModel if (!($row['last_buy_time'] >= $mondaySeconds && $row['last_buy_time'] <= $mondaySeconds)) { $row['this_week_buy_times'] = 0; } + $monthFirstDaySeconds = myself()->_getMonthFirstDaySeconds(); + if (!($row['last_buy_time'] >= $monthFirstDaySeconds && $row['last_buy_time'] <= $monthFirstDaySeconds)) { + $row['this_month_buy_times'] = 0; + } return $row; }, $rows); } @@ -75,8 +79,8 @@ class HashRateShopBuyRecord extends BaseModel return "CASE WHEN (${cond}) THEN this_week_buy_times + ${goodsNum} ELSE 0 END"; }, 'this_month_buy_times' => function () use($goodsNum) { - $mondaySeconds = myself()->_getMondaySeconds(); - $cond = " last_buy_time>=${mondaySeconds} AND last_buy_time<=${mondaySeconds} + 3600 * 24 * 7 "; + $monthFirstDaySeconds = myself()->_getMonthFirstDaySeconds(); + $cond = " last_buy_time>=${monthFirstDaySeconds} AND last_buy_time<=${monthFirstDaySeconds} + 3600 * 24 * 7 "; return "CASE WHEN (${cond}) THEN this_month_buy_times + ${goodsNum} ELSE 0 END"; }, 'total_buy_times' => function () use($goodsNum) {