From 10dae59169c1ca22609a9c36ee402e030e6e815f Mon Sep 17 00:00:00 2001
From: =?UTF-8?q?=E7=A3=B7=E5=8F=B6?=
 <14103883+leaf-phos@user.noreply.gitee.com>
Date: Wed, 30 Apr 2025 22:54:23 +0800
Subject: [PATCH] =?UTF-8?q?debug=EF=BC=8C=E8=AE=A2=E5=8D=95=E6=97=B6?=
 =?UTF-8?q?=E9=97=B4=E5=92=8C=E5=AE=9A=E4=BD=8D=E6=97=B6=E9=97=B4=E9=97=AE?=
 =?UTF-8?q?=E9=A2=98?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

---
 .../locationLog/service/impl/LocationLogConverterImpl.java  | 6 +++++-
 1 file changed, 5 insertions(+), 1 deletion(-)

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;
     }