Merge remote-tracking branch 'origin/v6.4_transportation_20231110' into…

performance-web/src/main/java/com/clx/performance/service/impl/OrderGoodsTruckBindServiceImpl.java

 package com.clx.performance.service.impl;
 
 import cn.hutool.core.collection.CollectionUtil;
+import cn.hutool.json.JSONUtil;
 import com.clx.performance.dao.OrderChildDao;
 import com.clx.performance.dao.OrderGoodsDao;
 import com.clx.performance.dao.OrderGoodsTruckBindDao;
@@ -51,10 +52,14 @@ public class OrderGoodsTruckBindServiceImpl implements OrderGoodsTruckBindServic
         if (!result.succeed() || CollectionUtil.isEmpty(result.getData())) {
             throw new ServiceSystemException(PerformanceResultEnum.DATA_NOT_FIND);
         }
+        log.info("truckFeign.driverTruckList:{}", JSONUtil.parse(result.getData()));
         List<String> truckList = result.getData().stream().map(DriverTruckAppVo::getTruckNo).collect(Collectors.toList());
-
+        log.info("过滤后的truckList:{}", JSONUtil.parse(truckList));
         LocalDateTime now = LocalDateTime.now();
 
+        if (CollectionUtils.isEmpty(truckList)) {
+            return null;
+        }
         List<OrderGoodsTruckBind> list = orderGoodsTruckBindDao.getCancelOrderGoods(truckList,
                 DateUtils.formatDateTime(now.plusDays(-3), "yyyy-MM-dd HH:mm:ss").get(),
                 DateUtils.formatDateTime(now, "yyyy-MM-dd HH:mm:ss").get());