From 1abef6f0bce08294dc028e934867c86f46e4b747 Mon Sep 17 00:00:00 2001
From: =?UTF-8?q?=E5=B0=8F=E6=9C=B1?= <2671189764@qq.com>
Date: Wed, 30 Apr 2025 15:40:33 +0800
Subject: [PATCH] =?UTF-8?q?=E8=8E=B7=E5=8F=96=E7=94=A8=E6=88=B7=E4=BF=A1?=
 =?UTF-8?q?=E6=81=AF=E5=90=8E=E5=8F=B0=E7=9B=B4=E6=8E=A5=E5=8F=96?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

---
 .../dto/request/ReqWorkOrderDispatchDto.java    |  2 +-
 .../service/impl/EbikeBikeInfoServiceImpl.java  | 17 ++++++++++-------
 2 files changed, 11 insertions(+), 8 deletions(-)

diff --git a/ebike-maintenance/src/main/java/com/cdzy/ebikemaintenance/model/dto/request/ReqWorkOrderDispatchDto.java b/ebike-maintenance/src/main/java/com/cdzy/ebikemaintenance/model/dto/request/ReqWorkOrderDispatchDto.java
index 009ff541..9b0b2c28 100644
--- a/ebike-maintenance/src/main/java/com/cdzy/ebikemaintenance/model/dto/request/ReqWorkOrderDispatchDto.java
+++ b/ebike-maintenance/src/main/java/com/cdzy/ebikemaintenance/model/dto/request/ReqWorkOrderDispatchDto.java
@@ -25,5 +25,5 @@ public class ReqWorkOrderDispatchDto {
         /**
          * 调度工单类型
          */
-        private String DispatchType;
+        private String dispatchType;
     }
diff --git a/ebike-maintenance/src/main/java/com/cdzy/ebikemaintenance/service/impl/EbikeBikeInfoServiceImpl.java b/ebike-maintenance/src/main/java/com/cdzy/ebikemaintenance/service/impl/EbikeBikeInfoServiceImpl.java
index 600d5a2f..0de40709 100644
--- a/ebike-maintenance/src/main/java/com/cdzy/ebikemaintenance/service/impl/EbikeBikeInfoServiceImpl.java
+++ b/ebike-maintenance/src/main/java/com/cdzy/ebikemaintenance/service/impl/EbikeBikeInfoServiceImpl.java
@@ -620,6 +620,15 @@ public class EbikeBikeInfoServiceImpl extends ServiceImpl<EbikeBikeInfoMapper, E
             if (faultIds == null || bikeCode.isEmpty()) {
                 return "";
             }
+
+            String tokenValue = StpUtil.getTokenValue();
+            JsonResult<StaffFeign> result = staffFeignClient.getInfoByToken(tokenValue);
+            if (result.getCode() != Code.SUCCESS) {
+                throw new RuntimeException("获取用户信息失败");
+            }
+            StaffFeign staffFeign = result.getData();
+            // 获取当前操作用户
+            String userId = staffFeign.getStaffId().toString();
             //生成工单编号
             SnowFlakeIDKeyGenerator snowFlakeIDKeyGenerator = new SnowFlakeIDKeyGenerator();
             long dataCenterId = snowFlakeIDKeyGenerator.nextId();
@@ -631,7 +640,7 @@ public class EbikeBikeInfoServiceImpl extends ServiceImpl<EbikeBikeInfoMapper, E
             ebikeBikeOrder.setBikeId(ebikeBikeInfo.getBikeId());
             ebikeBikeOrder.setOrderCode(dataCenterId);
             ebikeBikeOrder.setOrderType("1");
-            ebikeBikeOrder.setReceiverId(reqEbikeBikeOrderDto.getReceiverId());
+            ebikeBikeOrder.setReceiverId(userId);
             ebikeBikeOrderMapper.insert(ebikeBikeOrder);
             query.clear();
             query.in(EBIKE_BIKE_FAULT_REPORT.FAULT_REPORT_ID.getName(), Arrays.stream(faultIds).toList());
@@ -1189,7 +1198,6 @@ public class EbikeBikeInfoServiceImpl extends ServiceImpl<EbikeBikeInfoMapper, E
             ebikeScheduleWorkOrderExtension.setId(ebikeBikeOrder.getOrderId());
             ebikeScheduleWorkOrderExtension.setDispatchType(eqWorkOrderDispatchDto.getDispatchType());
             ebikeScheduleWorkOrderExtension.setSiteId(eqWorkOrderDispatchDto.getSiteId());//站点id
-            ebikeScheduleWorkOrderExtension.setDispatchType(eqWorkOrderDispatchDto.getDispatchType());
             ebikeScheduleWorkOrderExtensionMapper.insert(ebikeScheduleWorkOrderExtension);
             // 创建并保存调度记录
             List<EbikeDispatchRecords> records = new ArrayList<>();
@@ -1365,7 +1373,6 @@ public class EbikeBikeInfoServiceImpl extends ServiceImpl<EbikeBikeInfoMapper, E
      * @return
      */
     public JsonResult<?> completeDeployment(Map<String,Object> param) {
-
         String orderId = MapUtil.getStr(param, "orderId");
         List<Map<String,Object>> fileLists = (List<Map<String,Object>>) param.get("fileLists");
         //设置一个关联ID
@@ -1375,7 +1382,6 @@ public class EbikeBikeInfoServiceImpl extends ServiceImpl<EbikeBikeInfoMapper, E
             ebikeScheduleWorkOrderExtension.setAfterDispatchPhoto(after_dispatch_photo);
             ebikeScheduleWorkOrderExtension.setId(orderId);
             ebikeScheduleWorkOrderExtensionMapper.update(ebikeScheduleWorkOrderExtension);
-
             for (Map<String,Object> fileList : fileLists) {
                 EbikeVehicleDispatchFile ebikeVehicleDispatchFile = new EbikeVehicleDispatchFile();
                 ebikeVehicleDispatchFile.setFileName(fileList.get("fileName") != null ? fileList.get("fileName").toString() : "");
@@ -1389,14 +1395,12 @@ public class EbikeBikeInfoServiceImpl extends ServiceImpl<EbikeBikeInfoMapper, E
                 ebikeVehicleDispatchFileMapper.insert(ebikeVehicleDispatchFile);
              }
         }
-
         //根据orderId   完成订单
         EbikeBikeOrder ebikeBikeOrder = new EbikeBikeOrder();
         ebikeBikeOrder.setOrderId(orderId);
         ebikeBikeOrder.setHandleState("1");
         ebikeBikeOrder.setUpdatedAt(LocalDateTime.now());
         ebikeBikeOrderMapper.update(ebikeBikeOrder);
-
         //根据订单ID 查出需要投放的车辆 进行修改状态
         QueryWrapper query = QueryWrapper.create();
         query.eq("order_id",orderId);
@@ -1409,7 +1413,6 @@ public class EbikeBikeInfoServiceImpl extends ServiceImpl<EbikeBikeInfoMapper, E
             reqVehicleStatusUpdateDto.setState("2");
             updateVehicleStatus(reqVehicleStatusUpdateDto);
         }
-
         return JsonResult.success("投放成功");
     }
 }