From 2c974cfbc0d70d4b431e205a811a7c1a3f05bf62 Mon Sep 17 00:00:00 2001
From: =?UTF-8?q?=E6=9D=A8=E5=BB=BA=E7=82=8A?= <924182103@qq.com>
Date: Fri, 23 Aug 2024 15:33:10 +0800
Subject: [PATCH] =?UTF-8?q?=E9=B2=9C=E8=8A=B12.0-=E6=96=87=E6=A1=88?=
 =?UTF-8?q?=E8=B0=83=E6=95=B4?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

---
 app/Http/Controllers/Goods/GoodsCombinationController.php | 4 ++--
 app/Http/Controllers/Goods/GoodsSkusController.php        | 4 +++-
 2 files changed, 5 insertions(+), 3 deletions(-)

diff --git a/app/Http/Controllers/Goods/GoodsCombinationController.php b/app/Http/Controllers/Goods/GoodsCombinationController.php
index 4d8a324..9f0ac9d 100644
--- a/app/Http/Controllers/Goods/GoodsCombinationController.php
+++ b/app/Http/Controllers/Goods/GoodsCombinationController.php
@@ -120,7 +120,7 @@ class GoodsCombinationController extends Controller
             $stock = [];
             $saleStock = [];
             foreach ($combinationGoods as $item) {
-                if(!empty($skus[$item['item_id']])){
+                if (!empty($skus[$item['item_id']])) {
                     $stock[] = (int)($skus[$item['item_id']]['stock'] / $item['item_num']);
                     $saleStock[] = (int)($skus[$item['item_id']]['sale_stock'] / $item['item_num']);
                 }
@@ -200,7 +200,7 @@ class GoodsCombinationController extends Controller
             ->with('goods:id,title')
             ->get(['id', 'title', 'goods_id']);
         foreach ($skus as &$sku) {
-            $sku['title'] = $sku['goods']['title'] . $sku['title'];
+            $sku['title'] = ($sku['goods']['title'] ?? "") . $sku['title'];
         }
 
         return GoodsSkuResource::collection($skus);
diff --git a/app/Http/Controllers/Goods/GoodsSkusController.php b/app/Http/Controllers/Goods/GoodsSkusController.php
index 84e2397..fe1b1f9 100644
--- a/app/Http/Controllers/Goods/GoodsSkusController.php
+++ b/app/Http/Controllers/Goods/GoodsSkusController.php
@@ -200,7 +200,9 @@ class GoodsSkusController extends Controller
             $this->setBeforeUpdateForLog($sku->toArray());
             $skuInfo = $request->sku;
             $goodService = new GoodService();
-            $skuInfo['name'] = $goodService->getTypeFormatName($request->goods['type_id']) . $request->sku['title'];
+            $goods = $goodService->saveDefaultGoodsByGoodType($request->goods['type_id']);
+            $skuInfo['goods_id'] = $goods->id;
+            $skuInfo['name'] =$goods->title. $request->sku['title'];
             $sku->update($skuInfo);
             $this->setAfterUpdateForLog($sku->toArray());
             $this->addLog($id, 'update');