From c5a730fe660052e8ebe72a839f7f7a494d3a81f88957b0bafd479d254296c05f Mon Sep 17 00:00:00 2001
From: yanglei <yanglei@stargraph.cn>
Date: Fri, 5 Dec 2025 14:12:18 +0800
Subject: [PATCH] =?UTF-8?q?=E7=94=9F=E6=88=90=E8=B0=83=E5=BA=A6=E5=B7=A5?=
 =?UTF-8?q?=E5=8D=95=E6=97=B6=E5=91=BD=E5=90=8D=E8=A7=84=E8=8C=83?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

---
 .../impl/EbikeBikeInfoServiceImpl.java        | 26 ++++++++++---------
 1 file changed, 14 insertions(+), 12 deletions(-)

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 6675d49..b2a682c 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
@@ -167,7 +167,7 @@ public class EbikeBikeInfoServiceImpl extends ServiceImpl<EbikeBikeInfoMapper, E
 
         List<EbikeInventoryRecord> list = new ArrayList<>();
 
-        if (!ecuInfo.getBindBattery()){
+        if (!ecuInfo.getBindBattery()) {
             EbikeInventoryVo inventoryVo = EbikeInventoryVo.builder()
                     .operatorId(operatorId)
                     .inventoryType(1)
@@ -181,12 +181,12 @@ public class EbikeBikeInfoServiceImpl extends ServiceImpl<EbikeBikeInfoMapper, E
                     .build();
             list.add(inventoryRecord);
             inventoryService.reduceInventory(inventoryVo);
-        }else {
+        } else {
             ecuInfo.setIsClaim(Boolean.TRUE);
             ebikeEcuInfoService.updateById(ecuInfo);
         }
 
-        if (bindVo.getHasHelme()){
+        if (bindVo.getHasHelme()) {
             EbikeInventoryVo inventoryVo = EbikeInventoryVo.builder()
                     .operatorId(operatorId)
                     .inventoryType(2)
@@ -322,9 +322,9 @@ public class EbikeBikeInfoServiceImpl extends ServiceImpl<EbikeBikeInfoMapper, E
         }
         EbikeEcuInfo ebikeEcuInfo = ebikeEcuInfoService.getEcu(bikeCode);
 
-        ResGPSDto resGPSDto = (ResGPSDto)redisUtil.getEcu(ebikeEcuInfo.getEcuSn());
+        ResGPSDto resGPSDto = (ResGPSDto) redisUtil.getEcu(ebikeEcuInfo.getEcuSn());
 
-        if (resGPSDto.getSoc() < 20){
+        if (resGPSDto.getSoc() < 20) {
             throw new EbikeException("该车辆电量低,暂不能骑行");
         }
 
@@ -342,13 +342,13 @@ public class EbikeBikeInfoServiceImpl extends ServiceImpl<EbikeBikeInfoMapper, E
                 .where(EBIKE_BIKE_ORDER.HANDLE_STATE.eq(OrderHandleState.PROCESSED))
                 .where(EBIKE_BIKE_ORDER.DISPATCH_STATE.eq(OrderDispatchState.PROCESSED));
         EbikeBikeOrder bikeOrder = orderMapper.selectOneByQuery(query);
-       if (bikeOrder != null) {
-           redisUtil.deleteDispatchOrder(bikeOrder.getOrderId());
-           bikeOrder.setDispatchState(OrderDispatchState.EFFECTIVE);
-           orderMapper.update(bikeOrder);
-       }
+        if (bikeOrder != null) {
+            redisUtil.deleteDispatchOrder(bikeOrder.getOrderId());
+            bikeOrder.setDispatchState(OrderDispatchState.EFFECTIVE);
+            orderMapper.update(bikeOrder);
+        }
 
-       //若存在未处理/已接单的调度工单：作废未处理的调度工单
+        //若存在未处理/已接单的调度工单：作废未处理的调度工单
         List<Integer> list = new ArrayList<>();
         list.add(OrderHandleState.UNPROCESSED);
         list.add(OrderHandleState.ACCEPTED);
@@ -469,7 +469,9 @@ public class EbikeBikeInfoServiceImpl extends ServiceImpl<EbikeBikeInfoMapper, E
 
         EbikeDispatchConfiguration configuration = dispatchConfigurationService.getConfigurationByOperationId(info.getOperatorId());
 
-        redisUtil.saveNoDocument(bikeCode, "2", configuration.getDispatchDuration(), TimeUnit.HOURS);
+        if (configuration != null && configuration.getDispatchDuration() != null) {
+            redisUtil.saveNoDocument(bikeCode, LocalDateTime.now(), configuration.getDispatchDuration(), TimeUnit.HOURS);
+        }
 
         this.mapper.update(info);