From a00dd72640cddcc8e353ac419c415d5b22a1987d Mon Sep 17 00:00:00 2001
From: xiadc <251308692@qq.com>
Date: Tue, 17 Jun 2025 17:02:59 +0800
Subject: [PATCH] =?UTF-8?q?fix(shopro):=20=E4=BF=AE=E5=A4=8D=E5=91=A8?=
 =?UTF-8?q?=E6=9C=9F=E6=80=A7=E6=B4=BB=E5=8A=A8=E4=B8=8D=E8=83=BD=E9=87=8D?=
 =?UTF-8?q?=E5=A4=8D=E5=88=9B=E5=BB=BA=E9=97=AE=E9=A2=98?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

---
 addons/shopro/job/Test.php | 4 ++--
 1 file changed, 2 insertions(+), 2 deletions(-)

diff --git a/addons/shopro/job/Test.php b/addons/shopro/job/Test.php
index 3ce8683..5a6d7fe 100644
--- a/addons/shopro/job/Test.php
+++ b/addons/shopro/job/Test.php
@@ -89,9 +89,9 @@ class Test extends BaseJob
                 }
                 $endTime = explode(' ', $act['endTime']);
                 if (count($endTime) == 2) $act['endTime'] = $endTime[1];
-                $query = (clone $_gameModel)::where('act_id', $act['id']);
+                $query = (clone $_gameModel)::where('act_id', $act['id'])->where('public_time', $act['public_time']);
                 if ($act['type'] == 0) { //一次性活动
-                    $query->where('public_time', $act['public_time'])->where('date', $act['date']);
+                    $query->where('date', $act['date']);
                 }
                 $games = $query->select();
                 if (!empty($games)) {