bonus
/
Bonus-Cloud-Material-Mall
1
0
Fork 0
Code Issues Pull Requests Packages Projects Releases Wiki Activity

Merge remote-tracking branch 'origin/master'

This commit is contained in:
liang.chao 2024-12-18 13:57:52 +08:00
parent c95b9c3304 6cb78e0749
commit 9435687ae9
1 changed files with 3 additions and 0 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

3
bonus-modules/bonus-material-mall/src/main/java/com/bonus/material/order/controller/OrderController.java
View File

@ -281,6 +281,9 @@ public class OrderController extends BaseController {
StringBuilder orderDetail = new StringBuilder(); StringBuilder orderDetail = new StringBuilder();
List<OrderDetailDto> detailsList = orderInfoDto.getDetailsList(); List<OrderDetailDto> detailsList = orderInfoDto.getDetailsList();
for (OrderDetailDto orderDetailDto : detailsList) { for (OrderDetailDto orderDetailDto : detailsList) {
if (Objects.isNull(orderDetailDto.getRentBeginTime()) || Objects.isNull(orderDetailDto.getRentEndTime())) {
return AjaxResult.error("请先选择租期");
}
Date rentBeginTime = inputFormat.parse(orderDetailDto.getRentBeginTime().toString()); Date rentBeginTime = inputFormat.parse(orderDetailDto.getRentBeginTime().toString());
String beginTime = outputFormat.format(rentBeginTime); String beginTime = outputFormat.format(rentBeginTime);
Date rentEndTime = inputFormat.parse(orderDetailDto.getRentEndTime().toString()); Date rentEndTime = inputFormat.parse(orderDetailDto.getRentEndTime().toString());