From 8c829a76ec7a05373415008ed1c64d11f5d4e885848afdfcea0fb1e11a509db3 Mon Sep 17 00:00:00 2001
From: PC <2413103649@qq.com>
Date: Tue, 27 Jan 2026 16:17:01 +0800
Subject: [PATCH] =?UTF-8?q?=E5=B7=A5=E5=8D=95?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

---
 .../java/com/cdzy/operations/model/dto/EbikeScanOrderDto.java  | 3 +++
 .../cdzy/operations/service/impl/EbikeBikeInfoServiceImpl.java | 3 ++-
 .../operations/service/impl/EbikeBikeOrderServiceImpl.java     | 2 +-
 3 files changed, 6 insertions(+), 2 deletions(-)

diff --git a/ebike-operations/src/main/java/com/cdzy/operations/model/dto/EbikeScanOrderDto.java b/ebike-operations/src/main/java/com/cdzy/operations/model/dto/EbikeScanOrderDto.java
index b5dae7b..9e88f43 100644
--- a/ebike-operations/src/main/java/com/cdzy/operations/model/dto/EbikeScanOrderDto.java
+++ b/ebike-operations/src/main/java/com/cdzy/operations/model/dto/EbikeScanOrderDto.java
@@ -7,6 +7,7 @@ import lombok.NoArgsConstructor;
 
 import java.io.Serial;
 import java.io.Serializable;
+import java.time.LocalDateTime;
 
 /**
  *  车辆扫一扫详情。
@@ -48,6 +49,8 @@ public class EbikeScanOrderDto implements Serializable {
      */
     private Long orderCode;
 
+    private LocalDateTime createdAt;
+
     /**
      * 是否自己已接单
      */
diff --git a/ebike-operations/src/main/java/com/cdzy/operations/service/impl/EbikeBikeInfoServiceImpl.java b/ebike-operations/src/main/java/com/cdzy/operations/service/impl/EbikeBikeInfoServiceImpl.java
index d58179f..d6f50aa 100644
--- a/ebike-operations/src/main/java/com/cdzy/operations/service/impl/EbikeBikeInfoServiceImpl.java
+++ b/ebike-operations/src/main/java/com/cdzy/operations/service/impl/EbikeBikeInfoServiceImpl.java
@@ -589,7 +589,8 @@ public class EbikeBikeInfoServiceImpl extends ServiceImpl<EbikeBikeInfoMapper, E
                         EBIKE_BIKE_ORDER.BIKE_CODE,
                         EBIKE_BIKE_ORDER.ORDER_CODE
                 )
-                .where(EBIKE_BIKE_ORDER.BIKE_CODE.eq(bikeCode));
+                .where(EBIKE_BIKE_ORDER.BIKE_CODE.eq(bikeCode))
+                .where(EBIKE_BIKE_ORDER.HANDLE_STATE.eq(OrderHandleState.UNPROCESSED).or(EBIKE_BIKE_ORDER.HANDLE_STATE.eq(OrderHandleState.ACCEPTED)));
         List<EbikeScanOrderDto> list = orderMapper.selectListByQueryAs(queryWrapper, EbikeScanOrderDto.class);
         long staffId = StpUtil.getLoginIdAsLong();
         if (!list.isEmpty()) {
diff --git a/ebike-operations/src/main/java/com/cdzy/operations/service/impl/EbikeBikeOrderServiceImpl.java b/ebike-operations/src/main/java/com/cdzy/operations/service/impl/EbikeBikeOrderServiceImpl.java
index 0b05a31..609105a 100644
--- a/ebike-operations/src/main/java/com/cdzy/operations/service/impl/EbikeBikeOrderServiceImpl.java
+++ b/ebike-operations/src/main/java/com/cdzy/operations/service/impl/EbikeBikeOrderServiceImpl.java
@@ -196,7 +196,7 @@ public class EbikeBikeOrderServiceImpl extends ServiceImpl<EbikeBikeOrderMapper,
                 .where(EBIKE_BIKE_ORDER.BIKE_CODE.eq(bikeInfo.getBikeCode()))
                 .where(EBIKE_BIKE_ORDER.ORDER_TYPE.eq(BikeOrderType.DISPATCH))
                 .where(EBIKE_BIKE_ORDER.DISPATCH_STATE.eq(OrderDispatchState.PROCESSED));
-        EbikeBikeOrder order = this.mapper.selectOneByQuery(queryWrapper);
+        EbikeBikeOrder order = this.mapper.selectOneByQuery( queryWrapper);
         if (order != null) {
             log.error("车辆存在已完成但暂未生效的调度工单,bikeCode={} ", bikeInfo.getBikeCode());
             throw new EbikeException("车辆短时间内不能多次调度");