修改添加品牌

xx-vehicle/xx-vehicle-server/src/main/java/com/xxfc/platform/vehicle/biz/VehicleBiz.java

@@ -1622,7 +1622,7 @@ public class VehicleBiz extends BaseBiz<VehicleMapper, Vehicle> implements UserR
             throw  new BaseException("车牌号不能重复", ResultCode.FAILED_CODE);
         }
         Vehicle vehicle= JSONUtil.toBean(vehicleApply.getChangeJson(),Vehicle.class);
-        setVehicle(vehicle,vehicleApply.getChangeJson());
+        setVehicle(vehicle,vehicleApply);
         if (StringUtils.isNotBlank(vehicleId)){
             vehicle.setExtensionList(null);
             if (!CheckObjectIsNullUtils.objCheckIsNull(vehicle) ){
@@ -1644,7 +1644,8 @@ public class VehicleBiz extends BaseBiz<VehicleMapper, Vehicle> implements UserR
         return  vehicleId;
     }
 
-    public void setVehicle(Vehicle vehicle,String changeJson){
+    public void setVehicle(Vehicle vehicle,VehicleApply vehicleApply){
+        String changeJson = vehicleApply.getChangeJson();
         JSONObject jsonObject = JSONObject.parseObject(changeJson);
         if (jsonObject == null )
             return;
@@ -1653,7 +1654,7 @@ public class VehicleBiz extends BaseBiz<VehicleMapper, Vehicle> implements UserR
         vehicleCategory.setBrandName(brandName);
         String categoryName = jsonObject.getString("categoryName");
         vehicleCategory.setName(categoryName);
-        vehicleCategory.setGoodsType(vehicle.getGoodsType());
+        vehicleCategory.setGoodsType(vehicleApply.getGoodsType());
         vehicleCategory = vehicleCategoryBiz.addCategory(vehicleCategory);
         vehicle.setBrandId(vehicleCategory.getBrandId());
         vehicle.setCategoryId(vehicleCategory.getId());