diff --git a/app/Http/Controllers/Goods/GoodsCombinationController.php b/app/Http/Controllers/Goods/GoodsCombinationController.php index 5723e84..7133c6f 100644 --- a/app/Http/Controllers/Goods/GoodsCombinationController.php +++ b/app/Http/Controllers/Goods/GoodsCombinationController.php @@ -12,6 +12,7 @@ use App\Models\GoodsSku; use App\Utils\GeneratorUtils; use Illuminate\Http\Request; use Illuminate\Support\Facades\DB; +use Illuminate\Support\Facades\Log; use Illuminate\Support\Facades\Validator; use Illuminate\Validation\ValidationException; use Maatwebsite\Excel\Facades\Excel; @@ -25,7 +26,7 @@ class GoodsCombinationController extends Controller $skus = GoodsSku::query() ->with([ 'combinationGoods:id,goods_sku_id,item_id,item_num', - 'combinationGoods.goodsSkuItem:id,goods_id,title,stock,sale_stock,external_sku_id,updated_at,yesterday_num,reference_price,status', + 'combinationGoods.goodsSkuItem:id,name,goods_id,title,stock,sale_stock,external_sku_id,updated_at,yesterday_num,reference_price,status', 'combinationGoods.goodsSkuItem.goods:id,title,img_url', ]) ->where('is_combination', 1) @@ -66,8 +67,10 @@ class GoodsCombinationController extends Controller ->sum('already_cancel_number'); $item['total_orders_num'] = $number - $cancelNumber; foreach ($item['combinationGoods'] as $combinationItem) { - $title = !empty($combinationItem['goodsSkuItem']['goods']['name'])?$combinationItem['goodsSkuItem']['goods']['name']: - $combinationItem['goodsSkuItem']['goods']['title'] . " " . $combinationItem['goodsSkuItem']['title']; + Log::info("TEST", [$combinationItem]); + $title = !empty($combinationItem['goodsSkuItem']['name']) ? $combinationItem['goodsSkuItem']['name'] : + (!empty($combinationItem['goodsSkuItem']['goods']) ? $combinationItem['goodsSkuItem']['goods']['title'] + . " " . $combinationItem['goodsSkuItem']['title'] : $combinationItem['goodsSkuItem']['title']); $items[] = [ 'cost' => 0, 'external_sku_id' => $combinationItem['goodsSkuItem']['external_sku_id'], @@ -79,8 +82,8 @@ class GoodsCombinationController extends Controller 'status' => $combinationItem['goodsSkuItem']['status'], 'stock' => $combinationItem['goodsSkuItem']['stock'], 'sale_stock' => $combinationItem['goodsSkuItem']['sale_stock'], - 'thumb_url' => $combinationItem['goodsSkuItem']['goods']['img_url'], - 'img_url' => $combinationItem['goodsSkuItem']['goods']['img_url'], + 'thumb_url' => null, + 'img_url' => null,//图片暂时去掉 'title' => $title, 'updated_at' => $combinationItem['goodsSkuItem']['updated_at'], 'yesterday_num' => $combinationItem['goodsSkuItem']['yesterday_num'],