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');