diff --git a/electripper-admin/src/main/java/com/ruoyi/web/controller/iot/receive/ReceiveController.java b/electripper-admin/src/main/java/com/ruoyi/web/controller/iot/receive/ReceiveController.java
index ea28ff9..63ecc6b 100644
--- a/electripper-admin/src/main/java/com/ruoyi/web/controller/iot/receive/ReceiveController.java
+++ b/electripper-admin/src/main/java/com/ruoyi/web/controller/iot/receive/ReceiveController.java
@@ -263,16 +263,18 @@ public class ReceiveController {
                                     // 判断该车辆是否在进行中的订单,并且车辆的锁状态是关,状态是骑行中
                                     Boolean inOrderBySn = etOrderService.isInOrderBySn(device.getSn());
                                     if (inOrderBySn && ServiceConstants.VEHICLE_STATUS_IN_USING.equals(device.getStatus()) && ServiceConstants.LOCK_STATUS_CLOSE.equals(device.getLockStatus())) { // 有正在骑行的订单,给车辆上电
-                                        log.info("返回营运区上电,有正在骑行的订单,给车辆上电--SN:" + device.getSn());
-                                        asDeviceService.sendCommand(device.getMac(), Token.getToken(), IotConstants.COMMAND_OPEN+IotConstants.COMMAND_FREQUENCY_5, "返回营运区上电",null,null);
-                                        // 更新车辆状态和锁状态
-                                        /** 3.更新车辆状态*/
-                                        device.setLockStatus(ServiceConstants.LOCK_STATUS_OPEN);
-                                        device.setStatus(ServiceConstants.VEHICLE_STATUS_IN_USING);
-                                        device.setIsAdminUnlocking("0");
-                                        int i1 = asDeviceService.updateAsDevice(device);
-                                        if(i1>1){
-                                            log.info("【返回营运区上电】更新车辆状态成功");
+                                        if(!noRidingArea){
+                                            log.info("返回营运区上电,有正在骑行的订单,给车辆上电--SN:" + device.getSn());
+                                            asDeviceService.sendCommand(device.getMac(), Token.getToken(), IotConstants.COMMAND_OPEN+IotConstants.COMMAND_FREQUENCY_5, "返回营运区上电",null,null);
+                                            // 更新车辆状态和锁状态
+                                            /** 3.更新车辆状态*/
+                                            device.setLockStatus(ServiceConstants.LOCK_STATUS_OPEN);
+                                            device.setStatus(ServiceConstants.VEHICLE_STATUS_IN_USING);
+                                            device.setIsAdminUnlocking("0");
+                                            int i1 = asDeviceService.updateAsDevice(device);
+                                            if(i1>1){
+                                                log.info("【返回营运区上电】更新车辆状态成功");
+                                            }
                                         }
                                     }
                                 }