提交 e9ac8015 authored 作者: liuhaiquan's avatar liuhaiquan

修改接单计算预计时间判断,如果没有车辆位置信息。则不进行计算预计时间,会影响到货单进程监控预计时间无值

上级 6a0e037d
......@@ -299,19 +299,30 @@ public class OrderChildServiceImpl implements OrderChildService {
}else{
//TODO 如果新增的车辆,缓存中没有中交兴路的位置信息,需要实时获取,否则这里无法获得预计时间了。
}
if(Objects.nonNull(truckLongitudeX) && Objects.nonNull(truckLatitudeY) ){
LocalDateTime expectSendTime = null;
LocalDateTime expectReceiveTime = null;
if(Objects.nonNull(orderGoods.getSendLongitude()) && Objects.nonNull(orderGoods.getSendLatitude()) ){
List<GdRouteDTO> sendGdRouteDTOS = getRoute(truckNo, truckLongitudeX, truckLatitudeY, orderGoods.getSendLongitude(),orderGoods.getSendLatitude());
Integer sendPlusTime = 0;
if (CollectionUtils.isNotEmpty(sendGdRouteDTOS)) {
sendPlusTime = sendGdRouteDTOS.get(0).getDuration();
Integer sendPlusTime = sendGdRouteDTOS.get(0).getDuration();
expectSendTime = now.plusSeconds(sendPlusTime);
}
List<GdRouteDTO> receiveGdRouteDTOS = getRoute(truckNo, truckLongitudeX, truckLatitudeY, orderGoods.getSendLongitude(),orderGoods.getSendLatitude());
Integer receivePlusTime = 0;
}
if(Objects.nonNull(orderGoods.getSendLongitude()) && Objects.nonNull(orderGoods.getSendLatitude()) ){
List<GdRouteDTO> receiveGdRouteDTOS = getRoute(truckNo, truckLongitudeX, truckLatitudeY, orderGoods.getReceiveLongitude(),orderGoods.getReceiveLatitude());
if (CollectionUtils.isNotEmpty(receiveGdRouteDTOS)) {
receivePlusTime = receiveGdRouteDTOS.get(0).getDuration();
Integer receivePlusTime = receiveGdRouteDTOS.get(0).getDuration();
expectReceiveTime = now.plusSeconds(receivePlusTime);
}
}
return new LocalDateTime[]{expectSendTime,expectReceiveTime};
}else{
log.warn("抢单操作未获取到当前车辆的中交兴路位置信息,货单号:{},车牌号:{}",orderGoods.getOrderGoodsNo(),truckNo);
return new LocalDateTime[]{null,null};
}
return new LocalDateTime[]{now.plusSeconds(sendPlusTime),now.plusSeconds(receivePlusTime)};
}
......
Markdown 格式
0%
您添加了 0 到此讨论。请谨慎行事。
请先完成此评论的编辑!
注册 或者 后发表评论