Merge branch 'develop' into feature/mzl_dev

app/admin/service/BrandSeriesService.php

@@ -317,10 +317,19 @@ class BrandSeriesService
                 'model_year' => $item['year'],
                 '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['sku_code'] = SkuCodeBuilder::build($modelData);
-            // 指纹
-            $modelData['fingerprint'] = Fingerprint::makeFromArray($modelData);
 
             try {
                 $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

@@ -188,8 +188,16 @@ class VehVehicleSkuService
         $data['corp_id']    = 0;
         $data['created_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;
     }
 
@@ -213,8 +221,16 @@ class VehVehicleSkuService
         }
         // 填充系统字段
         $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;
     }