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;//提前结束本次循环 } //判断是否满足门槛