调整活动bug

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=>'下架',

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,