运输服务-查询车辆信息bugfix

sckw-modules/sckw-transport/src/main/java/com/sckw/transport/service/LogisticsConsignmentService.java

@@ -830,15 +830,17 @@ public class LogisticsConsignmentService {
         for (String id : stringList) {
             List<OrderCarDTO> list = waybillOrderMapper.selectWaybillOrderCarListNotPage(id);
             List<String> collect = list.stream().map(OrderCarDTO::getTruckNo).collect(Collectors.toList());
-            Map<String, RTruckVo> truck = remoteFleetService.findTruck(collect);
-            for (OrderCarDTO orderCarDTO : list) {
+            if (CollectionUtils.isNotEmpty(collect)) {
+                Map<String, RTruckVo> truck = remoteFleetService.findTruck(collect);
+                for (OrderCarDTO orderCarDTO : list) {
 //            orderCarDTO.setDriverId(String.valueOf(orderCarDTO.getDriverId()));
 //            orderCarDTO.setDriverName(orderCarDTO.getDriverName());
 //            orderCarDTO.setDriverPhone(orderCarDTO.getDriverPhone());
 //            orderCarDTO.setDriverCard(orderCarDTO.getDriverCard());
-                orderCarDTO.setLoadAmount(truck.get(orderCarDTO.getTruckNo()) == null ?
-                        null : (truck.get(orderCarDTO.getTruckNo()).getActualWeight() == null ?
-                        null : (String.valueOf(truck.get(orderCarDTO.getTruckNo()).getActualWeight()))));
+                    orderCarDTO.setLoadAmount(truck.get(orderCarDTO.getTruckNo()) == null ?
+                            null : (truck.get(orderCarDTO.getTruckNo()).getActualWeight() == null ?
+                            null : (String.valueOf(truck.get(orderCarDTO.getTruckNo()).getActualWeight()))));
+                }
             }
             if (CollectionUtils.isNotEmpty(list)) {
                 returnList.addAll(list);
@@ -1062,6 +1064,7 @@ public class LogisticsConsignmentService {
         //修改单据本身数据
         logisticsOrder.setTotalLoadAmount(orderFinishDTO.getLoadAmount());
         logisticsOrder.setTotalUnloadAmount(orderFinishDTO.getUnloadAmount());
+        logisticsOrder.setIgnoreAmount(logisticsOrder.getAmount());
         logisticsOrder.setStatus(LogisticsOrderEnum.HAVE_FINISHED.getCode());
         logisticsOrder.setUpdateTime(new Date());
         logisticsOrder.setUpdateBy(LoginUserHolder.getUserId());
@@ -1407,6 +1410,13 @@ public class LogisticsConsignmentService {
     }
 
 
+    /**
+     * 修改物流订单状态，以及状态表新增记录
+     *
+     * @param lOrderId       物流订单id
+     * @param orderFinishDTO 页面请求参数
+     * @param ignoreAmount   剩余量
+     */
     private void updateLogisticOrderAndTrack(Long lOrderId, OrderFinishDTO orderFinishDTO, BigDecimal ignoreAmount) {
         Integer code = LogisticsOrderEnum.HAVE_FINISHED.getCode();
         kwtLogisticsOrderMapper.update(null, new LambdaUpdateWrapper<KwtLogisticsOrder>()