Commit 0572940d authored by 周健威's avatar 周健威

修改

parent fceb5a46
...@@ -231,6 +231,10 @@ public class SpecialRent implements Serializable { ...@@ -231,6 +231,10 @@ public class SpecialRent implements Serializable {
@ApiModelProperty(value = "商品信息json") @ApiModelProperty(value = "商品信息json")
private String goodsJson; private String goodsJson;
public void setGoodsJson(String goodsJson) {
this.goodsJson = goodsJson;
}
@Column(name = "brand_name") @Column(name = "brand_name")
@ApiModelProperty("品牌名称") @ApiModelProperty("品牌名称")
private String brandName; private String brandName;
......
...@@ -26,6 +26,7 @@ import com.xxfc.platform.order.pojo.order.add.AddRentVehicleDTO; ...@@ -26,6 +26,7 @@ import com.xxfc.platform.order.pojo.order.add.AddRentVehicleDTO;
import com.xxfc.platform.order.service.OrderRentVehicleService; import com.xxfc.platform.order.service.OrderRentVehicleService;
import com.xxfc.platform.vehicle.entity.Vehicle; import com.xxfc.platform.vehicle.entity.Vehicle;
import com.xxfc.platform.vehicle.feign.VehicleFeign; import com.xxfc.platform.vehicle.feign.VehicleFeign;
import com.xxfc.platform.vehicle.pojo.vo.VehicleVO;
import io.swagger.annotations.ApiModelProperty; import io.swagger.annotations.ApiModelProperty;
import io.swagger.annotations.ApiOperation; import io.swagger.annotations.ApiOperation;
import lombok.Data; import lombok.Data;
...@@ -221,12 +222,12 @@ public class SpecialRentController extends BaseController<SpecialRentBiz, Specia ...@@ -221,12 +222,12 @@ public class SpecialRentController extends BaseController<SpecialRentBiz, Specia
@Data @Data
public static class SpecialRentVO extends SpecialRent{ public static class SpecialRentVO extends SpecialRent{
Vehicle vehicle; VehicleVO vehicle;
@Override @Override
public void setGoodsJson(String goodsJson) { public void setGoodsJson(String goodsJson) {
super.setGoodsJson(goodsJson); super.setGoodsJson(goodsJson);
if(StrUtil.isNotBlank(goodsJson)) { if(StrUtil.isNotBlank(goodsJson)) {
setVehicle(JSONUtil.toBean(goodsJson, Vehicle.class)); setVehicle(JSONUtil.toBean(goodsJson, VehicleVO.class));
super.setGoodsJson(null); super.setGoodsJson(null);
} }
} }
......
Markdown is supported
0% or
You are about to add 0 people to the discussion. Proceed with caution.
Finish editing this message first!
Please register or to comment