Merge remote-tracking branch 'origin/v20.8_add_sub_weight_20240805' into test

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

@@ -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);