Skip to content

G
gogirl-miniapp-backend
Commit 2cc5d0f5 by huluobin
Options

update

parent 0d2e9dd3
Showing with 12 additions and 9 deletions
src/main/java/com/gogirl/application/order/serve/impl/OrderManageServiceImpl.java
...@@ -409,15 +409,18 @@ public class OrderManageServiceImpl extends ServiceImpl<OrderManageMapper, Order ...@@ -409,15 +409,18 @@ public class OrderManageServiceImpl extends ServiceImpl<OrderManageMapper, Order
if (ListUtil.isNotEmpty(list)) { if (ListUtil.isNotEmpty(list)) {
orderManage.setScheduleManage(list.stream().findAny().orElse(null)); orderManage.setScheduleManage(list.stream().findAny().orElse(null));
} }
orderManage.getListOrderServer().forEach(orderServe -> { //兼容遗留数据
if (orderServe.getEndTime() != null && orderServe.getStartTime() != null) { if (ListUtil.isEmpty(orderManage.getListOrderServer())) {
orderServe.setActualServeDuration((int) (orderServe.getEndTime().getTime() - orderManage.getListOrderServer().forEach(orderServe -> {
orderServe.getStartTime().getTime()) / 1000 / 60); if (orderServe.getEndTime() != null && orderServe.getStartTime() != null) {
} orderServe.setActualServeDuration((int) (orderServe.getEndTime().getTime() -
if (ListUtil.isNotEmpty(orderRecordMap.get(orderServe.getId()))) { orderServe.getStartTime().getTime()) / 1000 / 60);
orderServe.setOrderRecord(orderRecordMap.get(orderServe.getId()).stream().findAny().orElse(null)); }
} if (ListUtil.isNotEmpty(orderRecordMap.get(orderServe.getId()))) {
}); orderServe.setOrderRecord(orderRecordMap.get(orderServe.getId()).stream().findAny().orElse(null));
}
});
}
}); });
return orderManagePage; return orderManagePage;
......
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