From 2847c41f3c1fb292a18343d13eda80d338110ebd Mon Sep 17 00:00:00 2001
From: vine_liutk <961510893@qq.com>
Date: Tue, 22 Mar 2022 11:22:03 +0800
Subject: [PATCH] =?UTF-8?q?=E8=B0=83=E6=95=B4=E6=B4=BB=E5=8A=A8bug?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

---
 app/Admin/Controllers/ActivityController.php | 2 +-
 app/Services/OrderService.php                | 8 +++++++-
 2 files changed, 8 insertions(+), 2 deletions(-)

diff --git a/app/Admin/Controllers/ActivityController.php b/app/Admin/Controllers/ActivityController.php
index 3cdd43f7..a6a4f8c6 100644
--- a/app/Admin/Controllers/ActivityController.php
+++ b/app/Admin/Controllers/ActivityController.php
@@ -28,7 +28,7 @@ class ActivityController extends AdminController
         return Grid::make(new Activity(), function (Grid $grid) {
             $grid->column('id')->sortable();
             $grid->column('title');
-            $grid->column('cover')->image(100);
+            $grid->column('cover')->image(50);
             // $grid->column('content');
             $grid->column('is_use')->filter(Grid\Column\Filter\In::make([
                     0=>'下架',
diff --git a/app/Services/OrderService.php b/app/Services/OrderService.php
index 553ca6b9..08a584fc 100644
--- a/app/Services/OrderService.php
+++ b/app/Services/OrderService.php
@@ -399,7 +399,13 @@ class OrderService
             $activityArr[$item->activity_id][] = $item->part_id;
         });
         $giveGifts = [];
+        $sendedActivities = [];
         foreach ($partActivities as $partActivity) {
+            //判断该活动是否已处理
+            if (in_array($partActivity->activity_id, $sendedActivities)) {
+                continue;
+            }
+            $sendedActivities[] = $partActivity->activity_id;
             //获取活动的赠品赠送规则
             $_giftsRule = $partActivity->activity?->gifts_rule;
             //判断是否首单：times=0为仅首单赠送, 1为不限
@@ -423,7 +429,7 @@ class OrderService
             $_gifts = $partActivity->activity->gifts;
             $_num = 0;
             foreach ($_gifts as $_gift) {
-                if ($_gift->stock - $_gift->pivot->qty >= 0) {
+                if (($_gift->stock - $_gift->pivot->qty) >= 0) {
                     $_num += $_gift->pivot->qty;
                     $giveGifts[] = [
                         'gift_for_sku_id'=> null,