Merge branch 'feature/vehicle_new_sku' into develop

This commit is contained in:
2025-06-20 16:47:09 +08:00
2 changed files with 11 additions and 4 deletions
+10 -3
View File
@@ -112,12 +112,19 @@ class VehicleNewController extends BaseController
return $result;
}
foreach ($item['sku'] as &$sku) {
foreach ($sku['skuAttributes'] as &$skuAttribute){
$i=0;
$skuAttributes = $sku['skuAttributes'];
foreach ($skuAttributes as $key => &$skuAttribute){
$attribute = VehicleNewAttributesTranslationModel::where(['attributes_id' => $skuAttribute['attribute']['id'],'locale'=>locale()])->first();
$value = VehicleNewAttributeValuesTranslationModel::where(['values_id' => $skuAttribute['value']['id'],'locale'=>locale()])->first();
$skuAttribute['attribute']['attribute_name'] = $attribute['attribute_name'] ;
$skuAttribute['value']['value_name'] = $value['value_name'];
//$skuAttribute['attribute']['attribute_name'] = $attribute['attribute_name'] ;
//$skuAttribute['value']['value_name'] = $value['value_name'];
$sku['skuAttributes'][$key]['attribute_name'] = $attribute['attribute_name'];
$sku['skuAttributes'][$key]['value_name'] = $value['value_name'];
$sku['skuAttributes'][$key]['color_code'] =$sku['skuAttributes'][$key]['value']['color_code'];
$sku['skuAttributes'][$key]['img_full'] = (!empty($skuAttribute['img']))?(new \app\mzl\modules\upload\service\OssService())->generatePrivateUrl($skuAttribute['img']):'';
}
$result['sku'][] = $sku;
}
+1 -1
View File
@@ -79,7 +79,7 @@ class VehicleNewService extends BaseService
'energy.translation' => ['energy_id', 'name'],
'models.translation' => ['model_id', 'name'],
'sku' => [],
'sku.skuAttributes' => [],
'sku.skuAttributes' => ['id','sku_id','attribute_id','value_id','img',],
'sku.skuAttributes.attribute' => ['id', 'input_type', 'is_img', 'status'],
'sku.skuAttributes.value' => ['id','color_code'],
],