Merge remote-tracking branch 'origin/master'
This commit is contained in:
commit
9435687ae9
|
|
@ -281,6 +281,9 @@ public class OrderController extends BaseController {
|
|||
StringBuilder orderDetail = new StringBuilder();
|
||||
List<OrderDetailDto> detailsList = orderInfoDto.getDetailsList();
|
||||
for (OrderDetailDto orderDetailDto : detailsList) {
|
||||
if (Objects.isNull(orderDetailDto.getRentBeginTime()) || Objects.isNull(orderDetailDto.getRentEndTime())) {
|
||||
return AjaxResult.error("请先选择租期");
|
||||
}
|
||||
Date rentBeginTime = inputFormat.parse(orderDetailDto.getRentBeginTime().toString());
|
||||
String beginTime = outputFormat.format(rentBeginTime);
|
||||
Date rentEndTime = inputFormat.parse(orderDetailDto.getRentEndTime().toString());
|
||||
|
|
|
|||
Loading…
Reference in New Issue