暂存

app/Admin/Controllers/ActivityController.php

@@ -27,8 +27,11 @@ class ActivityController extends AdminController
             $grid->column('id')->sortable();
             $grid->column('title');
             $grid->column('cover')->image(100);
-            $grid->column('content');
-            $grid->column('is_use')
+            // $grid->column('content');
+            $grid->column('is_use')->filter(Grid\Column\Filter\In::make([
+                    0=>'下架',
+                    1=>'上架',
+                ]))
                 ->if(function () {
                     return Admin::user()->can('dcat.admin.activities.edit');
                 })
@@ -40,8 +43,8 @@ class ActivityController extends AdminController
                 });
             $grid->column('started_at');
             $grid->column('ended_at');
-            $grid->column('created_at');
-            $grid->column('updated_at')->sortable();
+            $grid->model()->orderBy('created_at', 'desc');
+            $grid->column('created_at')->sortable();
             //新增
             if (Admin::user()->can('dcat.admin.activities.create')) {
                 $grid->disableCreateButton(false);

app/Listeners/SendCoupons.php

@@ -48,10 +48,12 @@ class SendCoupons
                     }
                 }
             }
+            //根据分区整理参与的活动--todo
+            //根据活动规则计算发送券--todo
 
-            foreach ($inValidParts as $inValidPart) {
-                $this->couponService->receivePartCoupon($inValidPart, $order->user);
-            }
+            // foreach ($inValidParts as $inValidPart) {
+            //     $this->couponService->receivePartCoupon($inValidPart, $order->user);
+            // }
 
             DB::commit();
         } catch (Throwable $th) {

app/Services/OrderService.php

@@ -261,9 +261,10 @@ class OrderService
                 'updated_at' => $order->updated_at,
             ];
 
-            // 将赠品加入订单中
-            $gifts = $this->deductProduct($sku, $qty);
-
+            // 扣除商品库存
+            $this->deductProduct($sku, $qty);
+            //根据订单参加的活动添加赠品 --todo；
+            $gifts = [];
             foreach ($gifts as $gift) {
                 $giftSku = $gift['sku'];
 
@@ -296,7 +297,8 @@ class OrderService
     }
 
     /**
-     * 扣商品的库存和赠品数量
+     * 扣商品的库存
+     * 03-04取消根据商品赠送赠品
      *
      * @param \App\Models\ProductSku $sku
      * @param int $qty
@@ -312,16 +314,16 @@ class OrderService
 
         $sku->spu?->increment('sales', $qty);
 
-        // 如果是因为赠品库存不足引起的异常，则需重试
-        do {
-            try {
-                return $this->deductGifts($sku, $qty);
-            } catch (QueryException $e) {
-                if (strpos($e->getMessage(), 'Numeric value out of range') === false) {
-                    throw $e;
-                }
-            }
-        } while (true);
+        // // 如果是因为赠品库存不足引起的异常，则需重试
+        // do {
+        //     try {
+        //         return $this->deductGifts($sku, $qty);
+        //     } catch (QueryException $e) {
+        //         if (strpos($e->getMessage(), 'Numeric value out of range') === false) {
+        //             throw $e;
+        //         }
+        //     }
+        // } while (true);
     }
 
     /**