Merge remote-tracking branch 'origin/test' into test

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

@@ -3304,7 +3304,7 @@ public class OrderChildServiceImpl implements OrderChildService {
             if (Objects.isNull(truckLongitudeX) || Objects.isNull(truckLatitudeY)) {
                 continue;
             }
-            Integer distance = getGdRoute(truckNo, orderGoods.getSendLongitude(), orderGoods.getSendLatitude(), siteLongitudeX,
+            Integer distance = getGdRoute(truckNo, truckLongitudeX, truckLatitudeY, siteLongitudeX,
                     siteLatitudeY);
             if (distance == null) {
                 log.info("高德获取卡车与货源地位置距离失败,orderGoodsNo:{},orderChildNo:{},truckNo:{}", orderGoodsNo, childNo, truckNo);
@@ -3549,6 +3549,14 @@ public class OrderChildServiceImpl implements OrderChildService {
                 notCancelOrderChildList.add(child);
             }
         }
+        //如果可取消的订单为空。直接返回
+        if(CollectionUtils.isEmpty(canCancelOrderChildList)){
+            UpdateCarrierBatchCancelVO result = new UpdateCarrierBatchCancelVO();
+            result.setFailChildNoList(notCancelOrderChildList.stream().map(OrderChild :: getChildNo).collect(Collectors.toList()));
+            result.setSuccessCount(canCancelOrderChildList.size());
+            return result;
+        }
+
         // 返回吨数
         batchUpdateOrderGoodsWeightReturn(canCancelOrderChildList);