From f797287f55fb6b70e8582fa8fdf5bae07aedfcbb Mon Sep 17 00:00:00 2001
From: aozhiwei <aozhiwei@kingsome.cn>
Date: Sat, 12 Oct 2024 15:26:32 +0800
Subject: [PATCH] 1

---
 webapp/models/ShopBuyRecord.php | 10 ++++++----
 1 file changed, 6 insertions(+), 4 deletions(-)

diff --git a/webapp/models/ShopBuyRecord.php b/webapp/models/ShopBuyRecord.php
index bc717409..93dbc348 100644
--- a/webapp/models/ShopBuyRecord.php
+++ b/webapp/models/ShopBuyRecord.php
@@ -32,11 +32,13 @@ class ShopBuyRecord extends BaseModel
         );
         return array_map(function ($row) {
             $nowDaySeconds = myself()->_getNowDaySeconds();
-            if (!($row['last_buy_time'] >= $nowDaySeconds && $row['last_buy_time'] <= $nowDaySeconds)) {
+            if (!($row['last_buy_time'] >= $nowDaySeconds &&
+                  $row['last_buy_time'] <= $nowDaySeconds + 3600 * 24)) {
                 $row['this_day_buy_times'] = 0;
             }
             $mondaySeconds = myself()->_getMondaySeconds();
-            if (!($row['last_buy_time'] >= $mondaySeconds && $row['last_buy_time'] <= $mondaySeconds)) {
+            if (!($row['last_buy_time'] >= $mondaySeconds &&
+                  $row['last_buy_time'] <= $mondaySeconds + 3600 * 24 * 7)) {
                 $row['this_week_buy_times'] = 0;
             }
             return $row;
@@ -71,12 +73,12 @@ class ShopBuyRecord extends BaseModel
                 'this_day_buy_times' => function () {
                     $nowDaySeconds = myself()->_getNowDaySeconds();
                     $cond = " last_buy_time>=${nowDaySeconds} AND last_buy_time<=${nowDaySeconds} + 3600 * 24 ";
-                    return "CASE WHEN (${cond}) THEN this_day_buy_times + 1 ELSE 0 END";
+                    return "CASE WHEN (${cond}) THEN this_day_buy_times + 1 ELSE 1 END";
                 },
                 'this_week_buy_times' => function () {
                     $mondaySeconds = myself()->_getMondaySeconds();
                     $cond = " last_buy_time>=${mondaySeconds} AND last_buy_time<=${mondaySeconds} + 3600 * 24 * 7 ";
-                    return "CASE WHEN (${cond}) THEN this_week_buy_times + 1 ELSE 0 END";
+                    return "CASE WHEN (${cond}) THEN this_week_buy_times + 1 ELSE 1 END";
                 },
                 'total_buy_times' => function () {
                     return 'total_buy_times + 1';