From a0bf115f56b238ad73d099f4ca9ddf47dea25f94 Mon Sep 17 00:00:00 2001
From: Edward Yang <yangjin@opencart.cn>
Date: Fri, 9 Sep 2022 16:41:36 +0800
Subject: [PATCH] =?UTF-8?q?=E4=BF=AE=E5=A4=8D=E8=AE=A2=E5=8D=95SKU=20https?=
 =?UTF-8?q?://guangdagit.com/beike/beikeshop/issues/240?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

---
 beike/Repositories/OrderProductRepo.php  | 13 +++++++++++--
 beike/Shop/Http/Resources/CartDetail.php |  2 ++
 2 files changed, 13 insertions(+), 2 deletions(-)

diff --git a/beike/Repositories/OrderProductRepo.php b/beike/Repositories/OrderProductRepo.php
index 6aa8bc14..0914361d 100644
--- a/beike/Repositories/OrderProductRepo.php
+++ b/beike/Repositories/OrderProductRepo.php
@@ -19,6 +19,12 @@ use Illuminate\Database\Eloquent\Collection;
 
 class OrderProductRepo
 {
+    /**
+     * 创建商品明细
+     *
+     * @param Order $order
+     * @param $cartProducts
+     */
     public static function createOrderProducts(Order $order, $cartProducts)
     {
         $orderProducts = [];
@@ -26,7 +32,7 @@ class OrderProductRepo
             $orderProducts[] = [
                 'product_id' => $cartProduct['product_id'],
                 'order_number' => $order->number,
-                'product_sku' => $cartProduct['sku_id'],
+                'product_sku' => $cartProduct['product_sku'],
                 'name' => $cartProduct['name'],
                 'image' => $cartProduct['image'],
                 'quantity' => $cartProduct['quantity'],
@@ -36,11 +42,14 @@ class OrderProductRepo
         $order->orderProducts()->createMany($orderProducts);
     }
 
+
     /**
+     * 查找单条商品明细数据
+     *
      * @param $id
      * @return Builder|Builder[]|Collection|Model|null
      */
-    public static function find($id)
+    public static function find($id): Model|Collection|Builder|array|null
     {
         return OrderProduct::query()->findOrFail($id);
     }
diff --git a/beike/Shop/Http/Resources/CartDetail.php b/beike/Shop/Http/Resources/CartDetail.php
index 3f675d20..2bcd8625 100644
--- a/beike/Shop/Http/Resources/CartDetail.php
+++ b/beike/Shop/Http/Resources/CartDetail.php
@@ -20,6 +20,7 @@ class CartDetail extends JsonResource
         $sku = $this->sku;
         $product = $sku->product;
         $price = $sku->price;
+        $skuCode = $sku->sku;
         $description = $product->description;
         $productName = $description->name;
         $subTotal = $price * $this->quantity;
@@ -29,6 +30,7 @@ class CartDetail extends JsonResource
             'cart_id' => $this->id,
             'product_id' => $this->product_id,
             'sku_id' => $this->product_sku_id,
+            'product_sku' => $skuCode,
             'name' => $productName,
             'name_format' => sub_string($productName),
             'image' => $image,