Browse Source

支持attr

kphcdr 1 year ago
parent
commit
2cd47859b1

+ 3 - 3
app/Modules/Mini/Controllers/GoodsController.php

@@ -68,8 +68,9 @@ class GoodsController extends BaseController
     {
         $params = $this->valid([
             "id" => "required",
-            "sku_id" => "required",
+            "sku_id" => "",
             "sku_custom" => "",
+            "count" => "",
         ]);
         $params['source'] = Order::SOURCE_GOODS;
 
@@ -80,8 +81,7 @@ class GoodsController extends BaseController
     {
         $params = $this->valid([
             "id" => "required",
-            "sku_id" => "required",
-            "sku_custom" => "array",
+            'count' => "required",
         ]);
         $cart = app(CartService::class)->add(Auth::user(), $params);
         return $this->ok([

+ 2 - 8
app/Modules/Mini/Services/CartService.php

@@ -36,20 +36,14 @@ class CartService extends BaseService
     {
         $gid = $params['id'];
         $goods = Goods::findOrFail($gid);
-        $sku = GoodsSku::findOrFail($params['sku_id']);
         $cart = new Cart();
         $cart->user_id = $user->id;
         $cart->goods_id = $goods->id;
-        $cart->count = 1;
-        $sn = $sku->sn;
-        if ($skuCustom = Arr::get($params, "sku_custom")) {
-            $sn = $sn . "-" . implode("-", Arr::pluck($skuCustom, "spec_attr_custom"));
-        }
+        $cart->count = $params['count'];
         $cart->extra = [
             "goods_name" => $goods->name,
             "thumb" => $goods->thumb,
-            "sn" => $sn,
-            "sku_id" => $sku->id,
+            "sn" => $goods->sn,
         ];
         $cart->save();
 

+ 4 - 13
app/Modules/Mini/Services/OrderService.php

@@ -28,17 +28,13 @@ class OrderService extends BaseService
             $order->user_id = $user->id;
             $order->source = $params['source'];
             $order->save();
-
-            $sku = GoodsSku::where("goods_id", $params['id'])->where("id", $params['sku_id'])->first();
-            if (is_null($sku)) {
-                throw new ClientException("sku id:{$params['sku_id']} 没有找到");
-            }
+            $goods = Goods::findOrFail($params['id']);
             $og = new OrderGoods();
             $og->order_id = $order->id;
             $og->goods_id = $params['id'];
-            $og->sku_id = $params['sku_id'];
-            $og->count = 1;
-            $og->sn = $sku->sn;
+            $og->sku_id = 0;
+            $og->count = $params['count'];
+            $og->sn = $goods->sn;
             if ($skuCustom = Arr::get($params, "sku_custom")) {
                 $og->sn = $og->sn . "-" . implode("-", Arr::pluck($skuCustom, "spec_attr_custom"));
             }
@@ -48,13 +44,8 @@ class OrderService extends BaseService
         });
 
         OrderCreateEvent::dispatch($order);
-        $gid = $order->goods->first()->goods_id;
-        $goods = Goods::find($gid);
         return [
             "id" => $order->id,
-            "thumb" => $goods->thumb,
-            "name" => $goods->name,
-            "url" => "http://baidu.com/xxxx",
         ];
     }