Commit 3ade5a6b authored by 周健威's avatar 周健威

Merge branch 'feature-delay-add' into dev

parents f1323606 73681825
...@@ -172,13 +172,13 @@ public class OrderDelayBiz { ...@@ -172,13 +172,13 @@ public class OrderDelayBiz {
//根据订单号获取订单 //根据订单号获取订单
RestResponse restResponse = vehicleFeign.updateOrderBookRecord(new BookVehicleVO() {{ RestResponse restResponse = vehicleFeign.updateOrderBookRecord(new BookVehicleVO() {{
setVehicleId(orderPageVO.getOrderRentVehicleDetail().getVehicleId()); setVehicleId(orderPageVO.getOrderRentVehicleDetail().getVehicleId());
setBookStartDate(dto.getBookStartDate()); setBookStartDate(dto.getBookStartDateTime());
setBookEndDate(dto.getBookEndDate()); setBookEndDate(dto.getBookEndDateTime());
setBookStartDateTime(dto.getBookStartDateTime()); setBookStartDateTime(dto.getBookStartDateTime());
setBookEndDateTime(dto.getBookEndDateTime()); setBookEndDateTime(dto.getBookEndDateTime());
}}); }});
if( !SYS_TRUE.equals(restResponse.getCode())) { if( !SYS_JSON_TRUE.equals(restResponse.getStatus())) {
throw new BaseException(ResultCode.FAILED_CODE, Sets.newSet("延期失败")); throw new BaseException(ResultCode.FAILED_CODE, Sets.newSet("延期失败"));
} }
cloudTransact = 1; cloudTransact = 1;
......
...@@ -18,13 +18,13 @@ public class BookVehicleVO { ...@@ -18,13 +18,13 @@ public class BookVehicleVO {
/** /**
* 预定目标日期(开始) * 预定目标日期(开始)
*/ */
@ApiModelProperty("预定目标日期(开始)") @ApiModelProperty("预定目标日期(开始) yyyy-MM-dd HH:mm:ss")
private String bookStartDate; private String bookStartDate;
/** /**
* 预定目标日期(结束) * 预定目标日期(结束)
*/ */
@ApiModelProperty("预定目标日期(结束)") @ApiModelProperty("预定目标日期(结束) yyyy-MM-dd HH:mm:ss")
private String bookEndDate; private String bookEndDate;
/** /**
......
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