From 641b8f9e4660cd93a3eb1ea95fb7d2a7a2c36a2d Mon Sep 17 00:00:00 2001
From: vine_liutk <961510893@qq.com>
Date: Mon, 21 Mar 2022 14:16:01 +0800
Subject: [PATCH] =?UTF-8?q?=E8=B0=83=E6=95=B4=E6=AC=A1=E6=95=B0=E5=88=A4?=
 =?UTF-8?q?=E6=96=AD?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

---
 app/Listeners/SendCoupons.php | 5 ++++-
 app/Services/OrderService.php | 5 ++++-
 2 files changed, 8 insertions(+), 2 deletions(-)

diff --git a/app/Listeners/SendCoupons.php b/app/Listeners/SendCoupons.php
index 12e69588..c24fefa7 100644
--- a/app/Listeners/SendCoupons.php
+++ b/app/Listeners/SendCoupons.php
@@ -65,7 +65,10 @@ class SendCoupons
                 //获取活动的赠品赠送规则
                 $_couponsRule = $partActivity->activity?->coupons_rule;
                 //判断是否首单：times=0为仅首单赠送, 1为不限
-                if ($_couponsRule['times'] == 0 && UserCoupon::where('activity_id', $partActivity->activity_id)->exists()) {
+                if ($_couponsRule['times'] == 0 && UserCoupon::where([
+                        'activity_id' => $partActivity->activity_id,
+                        'user_id' => $order->user_id,
+                    ])->exists()) {
                     continue;//提前结束本次循环
                 }
                 //判断是否满足门槛
diff --git a/app/Services/OrderService.php b/app/Services/OrderService.php
index f4ba3ca7..0712e643 100644
--- a/app/Services/OrderService.php
+++ b/app/Services/OrderService.php
@@ -403,7 +403,10 @@ class OrderService
             //获取活动的赠品赠送规则
             $_giftsRule = $partActivity->activity?->gifts_rule;
             //判断是否首单：times=0为仅首单赠送, 1为不限
-            if ($_giftsRule['times'] == 0 && OrderProduct::where('activity_id', $partActivity->activity_id)->exists()) {
+            if ($_giftsRule['times'] == 0 && OrderProduct::where([
+                'activity_id' => $partActivity->activity_id,
+                'user_id' => $order->user_id,
+            ])->exists()) {
                 continue;//提前结束本次循环
             }
             //判断是否满足门槛