餐品加供应商

app/admin/service/goods/GoodsService.php

@@ -765,8 +765,17 @@ class GoodsService
                 $skus = [];
             }
 
+            // 供应商表
+            $supplier = [];
+            if(isset($main['join_goods_supplier_id']) && !empty($main['join_goods_supplier_id'])){
+                $supplierModel = Supplier::where('supplier_id',$main['join_goods_supplier_id'])->select('supplier_id','supplier_name')->first();
+                if (!empty($supplierModel)){
+                    $supplier = $supplierModel->toArray();
+                }
+            }
+
             // 合并数据
-            $data = array_merge($main, $detail, $label, $running, ['sku' => $skus]);
+            $data = array_merge($main, $detail, $label, $running, ['sku' => $skus],['supplier'=>$supplier]);
             $data['goods_sku_json_label'] = [];
 
             $data['goods_label'] = !empty($data['goods_label']) ? explode(',', $data['goods_label']) : [];