From 3867fd19fbf38896ecf424b8f148f3fbfdbd98f9 Mon Sep 17 00:00:00 2001
From: wangxiaowei <wang199765>
Date: Mon, 30 Sep 2024 16:08:52 +0800
Subject: [PATCH] =?UTF-8?q?=E5=88=A4=E6=96=AD=E7=94=A8=E6=88=B7=E6=98=AF?=
 =?UTF-8?q?=E5=90=A6=E5=8F=82=E4=B8=8E=E4=BA=86=E6=8A=A2=E8=B4=AD=E5=95=86?=
 =?UTF-8?q?=E5=93=81=E7=9A=84=E6=B4=BB=E5=8A=A8?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

---
 app/api/logic/GoodsLogic.php | 2 +-
 app/api/logic/OrderLogic.php | 2 +-
 2 files changed, 2 insertions(+), 2 deletions(-)

diff --git a/app/api/logic/GoodsLogic.php b/app/api/logic/GoodsLogic.php
index 2853e17d..6a9e2797 100755
--- a/app/api/logic/GoodsLogic.php
+++ b/app/api/logic/GoodsLogic.php
@@ -1115,7 +1115,7 @@ class GoodsLogic extends Logic
         }
 
         // 如果当前用户参与了抢购的活动（则不允许再次抢购）
-        $in_activity = Order::where('user_id', $userId)->where('order_status', '<', 4)->find();
+        $in_activity = Order::where(['user_id' => $userId, 'order_type' => 4])->where('order_status', '<', 4)->find();
 
         $goods['activity'] = [
             'type' => 4,
diff --git a/app/api/logic/OrderLogic.php b/app/api/logic/OrderLogic.php
index 507220d8..c135e76d 100755
--- a/app/api/logic/OrderLogic.php
+++ b/app/api/logic/OrderLogic.php
@@ -120,7 +120,7 @@ class OrderLogic extends Logic
         Db::startTrans();
         try {
             if ($post['order_type'] == 4) {
-                $in_activity = Order::where('user_id', $post['user_id'])->where('order_status', '<', 4)->find();
+                $in_activity = Order::where(['user_id' => $userId, 'order_type' => 4])->where('order_status', '<', 4)->find();
                 if ($in_activity) {
                     throw new Exception('每位用户只能限抢一件商品');
                 }