新增订单统计货单运单相关数据接口

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

@@ -20,6 +20,7 @@ import java.math.BigDecimal;
 import java.util.HashMap;
 import java.util.List;
 import java.util.Map;
+import java.util.Objects;
 
 @Service
 @Slf4j
@@ -81,19 +82,38 @@ public class OrderServiceImpl implements OrderService {
 
         for (OrderChild child : childList) {
             OrderStatisticsInfoDTO dto = result.get(child.getOrderNo());
-
-            //未取消的运单
-            if(child.getStatus() <= OrderChildEnum.Status.COMPLETE.getCode()){
-                dto.setOrderedTruckNum(dto.getOrderedTruckNum() + 1);
-
+            //取消的排除
+            if(child.getStatus() > OrderChildEnum.Status.COMPLETE.getCode()){
+                continue;
             }
+            //未取消的运单 接单数
+            dto.setOrderedTruckNum(dto.getOrderedTruckNum() + 1);
 
+            if(child.getStatus() >=OrderChildEnum.Status.CREATED.getCode()  &&
+                    child.getStatus() < OrderChildEnum.Status.LOAD.getCode() ){
+                dto.setNotLoadTruckNum(dto.getNotLoadTruckNum() + 1);
+            }
+            //到达货源地
+            if(Objects.equals(child.getStatus(),OrderChildEnum.Status.ARRIVE_SEND.getCode())){
+                dto.setArriveSendTruckNum(dto.getArriveSendTruckNum() + 1);
+            }
+            //到达卸车地
+            if(Objects.equals(child.getStatus(),OrderChildEnum.Status.ARRIVE_RECEIVE.getCode())){
+                dto.setArriveReceiveTruckNum(dto.getArriveReceiveTruckNum() + 1);
+            }
 
+            //已装车
+            if(child.getStatus() >= OrderChildEnum.Status.LOAD.getCode()){
+                dto.setLoadTruckNum(dto.getLoadTruckNum() + 1);
+                dto.setLoadWeight(dto.getLoadWeight().add(child.getLoadNet()));
+            }
+            //已卸车
+            if(child.getStatus() >= OrderChildEnum.Status.UNLOAD.getCode()){
+                dto.setUnLoadTruckNum(dto.getUnLoadTruckNum() + 1);
+                dto.setUnLoadWeight(dto.getUnLoadWeight().add(child.getUnloadNet()));
+            }
             result.put(child.getOrderNo(),dto);
         }
-
-
-
-        return null;
+        return result;
     }
 }