更改预警条件判断

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

@@ -1543,7 +1543,7 @@ public class OrderChildServiceImpl implements OrderChildService {
                 OrderChildExpectDTO oneExpect = orderChildExpect.get(0);
 
 
-                //预计到货源地趋势
+                //到达货源地预警
                 if(orderChildExpect.size() >= 2){
                     OrderChildExpectDTO twoExpect = orderChildExpect.get(1);
 
@@ -1562,7 +1562,20 @@ public class OrderChildServiceImpl implements OrderChildService {
                             }
                         }
                     }
-                    if(child.getStatus() >= OrderChildEnum.Status.ARRIVE_SEND.getCode()
+                    //装车预警
+                    if(Objects.nonNull(child.getArriveSendTime())
+                            && child.getStatus() >= OrderChildEnum.Status.ARRIVE_SEND.getCode()
+                            && child.getStatus() < OrderChildEnum.Status.LOAD.getCode()){
+                        LocalDateTime arriveTime = child.getArriveSendTime();
+                        LocalDateTime arriveWarringTime = arriveTime.plusMinutes(loadWarningTime);
+                        if(arriveWarringTime.isBefore(now)){
+                            monitorOrderChild.setLoadWarning(1);
+                        }else{
+                            monitorOrderChild.setLoadWarning(0);
+                        }
+                    }
+                    //到达目的地预警
+                    if(child.getStatus() >= OrderChildEnum.Status.LOAD.getCode()
                             && child.getStatus() < OrderChildEnum.Status.ARRIVE_RECEIVE.getCode() &&
                            Objects.nonNull(oneExpect.getExpectReceiveTimeSecond()) &&
                             Objects.nonNull(twoExpect.getExpectReceiveTimeSecond())){
@@ -1610,17 +1623,7 @@ public class OrderChildServiceImpl implements OrderChildService {
             }
 
 
-            if(Objects.nonNull(child.getArriveSendTime())
-                    && child.getStatus() >= OrderChildEnum.Status.ARRIVE_SEND.getCode()
-                    && child.getStatus() < OrderChildEnum.Status.LOAD.getCode()){
-                LocalDateTime arriveTime = child.getArriveSendTime();
-                LocalDateTime arriveWarringTime = arriveTime.plusMinutes(loadWarningTime);
-                if(arriveWarringTime.isBefore(now)){
-                    monitorOrderChild.setLoadWarning(1);
-                }else{
-                    monitorOrderChild.setLoadWarning(0);
-                }
-            }
+
             return monitorOrderChild;
         }).collect(Collectors.toList());