diff --git a/ebike-user/src/main/java/com/cdzy/user/controller/EbikeOrderController.java b/ebike-user/src/main/java/com/cdzy/user/controller/EbikeOrderController.java
index 6d14568..cfe90f7 100644
--- a/ebike-user/src/main/java/com/cdzy/user/controller/EbikeOrderController.java
+++ b/ebike-user/src/main/java/com/cdzy/user/controller/EbikeOrderController.java
@@ -4,7 +4,6 @@ import com.cdzy.common.model.response.JsonResult;
 import com.cdzy.user.model.dto.EbikeUserCyclingDto;
 import com.cdzy.user.model.dto.EbikeUserCyclingEndDto;
 import com.cdzy.user.model.entity.EbikeOrder;
-import com.cdzy.user.model.vo.EbikeOrderVo;
 import com.cdzy.user.service.EbikeOrderService;
 import com.ebike.feign.model.dto.FeignEbikeDto;
 import com.ebike.feign.model.dto.FeignEbikeUserBikeInfo;
diff --git a/ebike-user/src/main/java/com/cdzy/user/service/impl/EbikeOrderImpl.java b/ebike-user/src/main/java/com/cdzy/user/service/impl/EbikeOrderImpl.java
index ac86235..b10a529 100644
--- a/ebike-user/src/main/java/com/cdzy/user/service/impl/EbikeOrderImpl.java
+++ b/ebike-user/src/main/java/com/cdzy/user/service/impl/EbikeOrderImpl.java
@@ -81,29 +81,27 @@ public class EbikeOrderImpl extends ServiceImpl<EbikeOrderMapper, EbikeOrder> im
                 .orderType(OrderType.ONCE)
                 .startLocation(orderDto.getStartPoint())
                 .startTime(LocalDateTime.now())
-                .orderStatus(OrderStatus.IN_PROGRESS)
                 .createTime(LocalDateTime.now())
                 .build();
         save(order);
-        return order;
-//        try {
-//            // 尝试开锁
-//            EbikeUnlockResultDto unlockResult = attemptUnlockWithValidation(bikeCode, userId);
-//            if (!unlockResult.isSuccess()) {
-//                throw new EbikeException("开锁失败: " + unlockResult.getErrorMsg());
-//            }
-//            // 开锁成功
-//            EbikeOrder orders = EbikeOrder.builder()
-//                    .orderId(order.getOrderId())
-//                    .orderStatus(OrderStatus.IN_PROGRESS)
-//                    .updateTime(LocalDateTime.now())
-//                    .build();
-//            updateById(orders);
-//            return orders;
-//        } catch (Exception e) {
-//            log.error("开锁失败, userId={}, bikeCode={}", userId, bikeCode, e);
-//            throw new RuntimeException("开锁失败", e);
-//        }
+        try {
+            // 尝试开锁
+            EbikeUnlockResultDto unlockResult = attemptUnlockWithValidation(bikeCode, userId);
+            if (!unlockResult.isSuccess()) {
+                throw new EbikeException("开锁失败: " + unlockResult.getErrorMsg());
+            }
+            // 开锁成功
+            EbikeOrder orders = EbikeOrder.builder()
+                    .orderId(order.getOrderId())
+                    .orderStatus(OrderStatus.IN_PROGRESS)
+                    .updateTime(LocalDateTime.now())
+                    .build();
+            updateById(orders);
+            return orders;
+        } catch (Exception e) {
+            log.error("开锁失败, userId={}, bikeCode={}", userId, bikeCode, e);
+            throw new RuntimeException("开锁失败", e);
+        }
     }