调整活动

app/Admin/Controllers/ActivityController.php

@@ -245,7 +245,8 @@ class ActivityController extends AdminController
                             0=>'按订单赠送',
                             1=>'其他活动来源',
                         ])->default(0);
-                    $form->number('value', '门槛')->help('每N元赠送一份');
+                    $form->number('value', '门槛')->help('满N元赠送');
+                    // $form->number('qty', '总量')->help('前N单能获得');
                     $form->radio('times', '可领次数')->options([
                             '0'=>'仅首单',
                             '1'=>'不限',
@@ -257,7 +258,8 @@ class ActivityController extends AdminController
                             0=>'按订单赠送',
                             1=>'其他活动来源',
                         ])->default(0);
-                    $form->number('value', '门槛')->help('每N元赠送一份');
+                    $form->number('value', '门槛')->help('满N元赠送');
+                    // $form->number('qty', '总量')->help('前N单能获得');
                     $form->radio('times', '可领次数')->options([
                             '0'=>'仅首单',
                             '1'=>'不限',

app/Models/UserCoupon.php

@@ -42,6 +42,7 @@ class UserCoupon extends Model
         'is_use',
         'created_at',
         'updated_at',
+        'activity_id',
     ];
 
     /**

app/Services/CouponService.php

@@ -92,6 +92,7 @@ class CouponService
      */
     public function receiveActivityCoupons(Activity $activity, User $user)
     {
+        $someCoupons = [];
         foreach ($activity->coupons as $coupon) {
             $someCoupons[] = [
                 'coupon'=>$coupon,
@@ -121,7 +122,7 @@ class CouponService
                 $coupon['coupon']->decrement('stock', $coupon['num']);
             }
         }
-
+        // dd($userCoupons);
         UserCoupon::insert($userCoupons);
     }
 

app/Services/OrderService.php

@@ -421,7 +421,10 @@ class OrderService
             }
             //返回赠品
             $_gifts = $partActivity->activity->gifts;
+            $_num = 0;
             foreach ($_gifts as $_gift) {
+                if ($_gift->stock - $_gift->pivot->qty >= 0) {
+                    $_num += $_gift->pivot->qty;
                     $giveGifts[] = [
                         'gift_for_sku_id'=> null,
                         'user_id' => $order->user_id,
@@ -449,13 +452,15 @@ class OrderService
                     // 扣除商品库存
                     $this->deductProduct($_gift, $_gift->pivot->qty);
                 }
-
+            }
+            if ($_num > 0) {
                 //记录订单参与活动信息
                 OrderActivity::firstOrCreate([
                     'order_id'=>$order->id,
                     'activity_id'=>$partActivity->activity_id,
                 ]);
             }
+        }
 
         return $giveGifts;
     }
@@ -1001,6 +1006,8 @@ class OrderService
                 continue;
             }
 
+            //原赠品
+            if ($product->gift_for_sku_id) {
                 $gift = ProductGift::where('sku_id', $product->gift_for_sku_id)
                 ->where('gift_sku_id', $product->sku_id)
                 ->first();
@@ -1017,6 +1024,15 @@ class OrderService
                 } else {
                     $gift->decrement('sent', $product->quantity);
                 }
+                continue;
+            } else {//新赠品, 则直接增加商品库存
+                $product->spu?->increment('sales', -$product->quantity);
+                $product->sku?->update([
+                    'stock' => DB::Raw("stock + {$product->quantity}"),
+                    'sales' => DB::Raw("sales - {$product->quantity}"),
+                ]);
+                continue;
+            }
         }
 
         // 取消订单，退券