From b62dba7be06f82d645d5e2b2f1666a01670d34d41a59e382ff1f23c7374301c3 Mon Sep 17 00:00:00 2001
From: attiya <2413103649@qq.com>
Date: Tue, 23 Dec 2025 15:33:09 +0800
Subject: [PATCH] =?UTF-8?q?=E5=AE=8C=E6=88=90=E8=B0=83=E5=BA=A6=E5=AE=8C?=
 =?UTF-8?q?=E5=96=84?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

---
 .../service/impl/EbikeBikeOrderServiceImpl.java        | 10 ++++++++--
 1 file changed, 8 insertions(+), 2 deletions(-)

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 a7f733e..569debb 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
@@ -105,6 +105,9 @@ public class EbikeBikeOrderServiceImpl extends ServiceImpl<EbikeBikeOrderMapper,
     @Resource
     private EbikeOrderPartMapper ebikeOrderPartMapper;
 
+    @Resource
+    private EbikeDispatchConfigurationMapper ebikeDispatchConfigurationMapper;
+
     @Override
     public void createBatterySwapOrder(String ecuSn) {
         QueryWrapper queryWrapper = QueryWrapper.create()
@@ -568,7 +571,7 @@ public class EbikeBikeOrderServiceImpl extends ServiceImpl<EbikeBikeOrderMapper,
                 .where(EBIKE_BIKE_ORDER.ORDER_TYPE.eq(BikeOrderType.DISPATCH));
         EbikeBikeOrder bikeOrder = getOne(queryWrapper);
         if (bikeOrder == null) {
-            throw new EbikeException("该工单不存在或已作废");
+            throw new EbikeException("该工单不存在或已完成、已作废");
         }
         Long receiverId = bikeOrder.getReceiverId();
         long loginId = StpUtil.getLoginIdAsLong();
@@ -581,6 +584,7 @@ public class EbikeBikeOrderServiceImpl extends ServiceImpl<EbikeBikeOrderMapper,
         }
         bikeOrder.setSiteId(doneDispatchOrderVo.getSiteId());
         bikeOrder.setHandleState(OrderHandleState.PROCESSED);
+        bikeOrder.setRemarks(doneDispatchOrderVo.getRemarks());
         List<String> fileUrls = doneDispatchOrderVo.getFileUrls();
 
         List<EbikeOrderFile> list = new ArrayList<>();
@@ -600,7 +604,9 @@ public class EbikeBikeOrderServiceImpl extends ServiceImpl<EbikeBikeOrderMapper,
         //TODO:车辆状态
         bikeOrder.setHandleAt(LocalDateTime.now());
         updateById(bikeOrder);
-        redisUtil.saveDispatchOrder(bikeOrder.getOrderId(),bikeOrder,5L, TimeUnit.SECONDS);
+        queryWrapper.clear();
+        EbikeDispatchConfiguration dispatchConfiguration = ebikeDispatchConfigurationMapper.selectOneByQuery(queryWrapper);
+        redisUtil.saveDispatchOrder(bikeOrder.getOrderId(),bikeOrder,dispatchConfiguration!=null?dispatchConfiguration.getDispatchDuration():24L, TimeUnit.SECONDS);
     }
 
     @Override