更改预警条件判断

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

@@ -1547,7 +1547,8 @@ public class OrderChildServiceImpl implements OrderChildService {
                 if(orderChildExpect.size() >= 2){
                     OrderChildExpectDTO twoExpect = orderChildExpect.get(1);
 
-                    if(Objects.nonNull(oneExpect.getExpectArriveTimeSecond()) && Objects.nonNull(twoExpect.getExpectArriveTimeSecond())){
+                    if(child.getStatus() < OrderChildEnum.Status.ARRIVE_SEND.getCode() &&
+                            Objects.nonNull(oneExpect.getExpectArriveTimeSecond()) && Objects.nonNull(twoExpect.getExpectArriveTimeSecond())){
 
                         //如果车辆坐标没发生变化，则进行预警
                         if(new BigDecimal(oneExpect.getTruckLongitudeX()).compareTo(new BigDecimal(twoExpect.getTruckLongitudeX())) == 0
@@ -1561,8 +1562,10 @@ public class OrderChildServiceImpl implements OrderChildService {
                             }
                         }
                     }
-                    if(Objects.nonNull(oneExpect.getExpectReceiveTimeSecond()) && Objects.nonNull(twoExpect.getExpectReceiveTimeSecond())){
-
+                    if(child.getStatus() >= OrderChildEnum.Status.ARRIVE_SEND.getCode()
+                            && child.getStatus() < OrderChildEnum.Status.ARRIVE_RECEIVE.getCode() &&
+                           Objects.nonNull(oneExpect.getExpectReceiveTimeSecond()) &&
+                            Objects.nonNull(twoExpect.getExpectReceiveTimeSecond())){
                         //如果车辆坐标没发生变化，则进行预警
                         if(new BigDecimal(oneExpect.getTruckLongitudeX()).compareTo(new BigDecimal(twoExpect.getTruckLongitudeX())) == 0
                                 && new BigDecimal(oneExpect.getTruckLatitudeY()).compareTo(new BigDecimal(twoExpect.getTruckLatitudeY())) == 0){