xinyouhe/fdesk
1
0
Fork 0
Code Issues Pull Requests Actions Packages Projects Releases Wiki Activity

Merge branch 'develop' into feature/mzl_dev

Browse Source
This commit is contained in:
mzl
2025-10-22 16:15:55 +08:00
parent 7486803468 4c1ac68a2b
commit 448d151106
2 changed files with 31 additions and 6 deletions
Download Patch File Download Diff File Expand all files Collapse all files
app/admin/service/BrandSeriesService.php
+11 -2
View File
@@ -317,10 +317,19 @@ class BrandSeriesService
'model_year' => $item['year'], 'model_year' => $item['year'],
'msrp' => $item['msrp'], 'msrp' => $item['msrp'],
]; ];
//指纹数组
$fingerprintArr = [
'brand_name' => $modelData['brand_name'],
'series_name' => $modelData['series_name'],
'model_name' => $modelData['model_name'],
'model_year' => $modelData['model_year'],
'msrp' => $modelData['msrp'],
];
// 生成指纹
$modelData['fingerprint'] = Fingerprint::makeFromArray($fingerprintArr);
$modelData['model_code'] = ModelNaming::buildModelCode($modelData); $modelData['model_code'] = ModelNaming::buildModelCode($modelData);
$modelData['sku_code'] = SkuCodeBuilder::build($modelData); $modelData['sku_code'] = SkuCodeBuilder::build($modelData);
// 指纹
$modelData['fingerprint'] = Fingerprint::makeFromArray($modelData);
try { try {
$model = VehVehicleSku::where('brand_name', $brand->brand_name)->where('series_name', $series->series_name)->where('model_name', $item['title'])->first(); $model = VehVehicleSku::where('brand_name', $brand->brand_name)->where('series_name', $series->series_name)->where('model_name', $item['title'])->first();
app/common/service/VehVehicleSkuService.php
+20 -4
View File
@@ -188,8 +188,16 @@ class VehVehicleSkuService
$data['corp_id'] = 0; $data['corp_id'] = 0;
$data['created_by'] = $request->user->uid; $data['created_by'] = $request->user->uid;
$data['updated_by'] = $request->user->uid; $data['updated_by'] = $request->user->uid;
// 指纹 //指纹数组
$data['fingerprint'] = Fingerprint::makeFromArray($data); $fingerprintArr = [
'brand_name' => $data['brand_name'],
'series_name' => $data['series_name'],
'model_name' => $data['model_name'],
'model_year' => $data['model_year'],
'msrp' => $data['msrp'],
];
// 生成指纹
$data['fingerprint'] = Fingerprint::makeFromArray($fingerprintArr);
return $data; return $data;
} }
@@ -213,8 +221,16 @@ class VehVehicleSkuService
} }
// 填充系统字段 // 填充系统字段
$data['updated_by'] = $request->user->uid; $data['updated_by'] = $request->user->uid;
// 指纹 //指纹数组
$data['fingerprint'] = Fingerprint::makeFromArray($data); $fingerprintArr = [
'brand_name' => $data['brand_name'],
'series_name' => $data['series_name'],
'model_name' => $data['model_name'],
'model_year' => $data['model_year'],
'msrp' => $data['msrp'],
];
// 生成指纹
$data['fingerprint'] = Fingerprint::makeFromArray($fingerprintArr);
return $data; return $data;
} }