diff --git a/ruoyi-service/src/main/java/com/ruoyi/bst/locationLog/service/impl/LocationLogConverterImpl.java b/ruoyi-service/src/main/java/com/ruoyi/bst/locationLog/service/impl/LocationLogConverterImpl.java index a014577..b546a36 100644 --- a/ruoyi-service/src/main/java/com/ruoyi/bst/locationLog/service/impl/LocationLogConverterImpl.java +++ b/ruoyi-service/src/main/java/com/ruoyi/bst/locationLog/service/impl/LocationLogConverterImpl.java @@ -1,5 +1,7 @@ package com.ruoyi.bst.locationLog.service.impl; +import com.ruoyi.bst.order.domain.enums.OrderStatus; +import com.ruoyi.bst.orderDevice.domain.enums.OrderDeviceStatus; import org.springframework.beans.factory.annotation.Autowired; import org.springframework.stereotype.Service; @@ -49,7 +51,9 @@ public class LocationLogConverterImpl implements LocationLogConverter { po.setLatitude(device.getLatitude()); po.setAt(device.getLastLocationTime()); po.setDeviceId(device.getId()); - po.setOrderId(device.getOrderId()); + if (OrderDeviceStatus.inUse().contains(device.getOrderDeviceStatus())) { + po.setOrderId(device.getOrderId()); + } return po; }