Merge remote-tracking branch 'origin/v21.5_offered_third_data_20240812' into test

performance-web/src/main/java/com/clx/performance/extranal/user/impl/OrderServiceImpl.java

@@ -7,6 +7,7 @@ import com.clx.order.vo.feign.FeignOrderInfoVO;
 import com.clx.performance.dao.OrderChildDao;
 import com.clx.performance.dao.OrderGoodsDao;
 import com.clx.performance.enums.OrderChildEnum;
+import com.clx.performance.enums.OrderGoodsStatusEnum;
 import com.clx.performance.extranal.user.OrderService;
 import com.clx.performance.model.OrderChild;
 import com.clx.performance.model.OrderGoods;
@@ -80,6 +81,9 @@ public class OrderServiceImpl implements OrderService {
         }
         //计算挂单车数
         for (OrderGoods orderGood : orderGoods) {
+            if(Objects.equals(orderGood.getOrderGoodsStatus(), OrderGoodsStatusEnum.Status.CANCEL.getCode())){
+                continue;
+            }
             OrderStatisticsInfoDTO dto = result.get(orderGood.getOrderNo());
             dto.setPendingTruckNum(dto.getPendingTruckNum() + orderGood.getNeedTruckNum());
             result.put(orderGood.getOrderNo(),dto);