From 7d3aa6881f898c17883c522d74d27d7fa13e1c11 Mon Sep 17 00:00:00 2001
From: vine_liutk <961510893@qq.com>
Date: Tue, 22 Mar 2022 14:45:19 +0800
Subject: [PATCH] =?UTF-8?q?=E8=B0=83=E6=95=B4=E9=A2=86=E5=8F=96=E5=A5=96?=
 =?UTF-8?q?=E5=93=81=E6=9F=A5=E8=AF=A2sql?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

---
 app/Services/OrderService.php | 4 +++-
 1 file changed, 3 insertions(+), 1 deletion(-)

diff --git a/app/Services/OrderService.php b/app/Services/OrderService.php
index 08a584fc..cda3edac 100644
--- a/app/Services/OrderService.php
+++ b/app/Services/OrderService.php
@@ -412,7 +412,9 @@ class OrderService
             if ($_giftsRule['times'] == 0 && OrderProduct::where([
                 'activity_id' => $partActivity->activity_id,
                 'user_id' => $order->user_id,
-            ])->exists()) {
+            ])->whereHas('order', function ($query) {//除取消外的订单
+                return $query->where('status', '<>', Order::STATUS_CANCELLED);
+            })->exists()) {
                 continue;//提前结束本次循环
             }
             //判断是否满足门槛