From 0ac0976ecf6883fb7172f29d160892d7977f8de0 Mon Sep 17 00:00:00 2001
From: =?UTF-8?q?=E5=B0=8F=E6=9C=B1?= <2671189764@qq.com>
Date: Mon, 28 Apr 2025 18:23:58 +0800
Subject: [PATCH] =?UTF-8?q?=E5=AE=8C=E6=88=90=E6=8A=95=E6=94=BE=E6=8E=A5?=
 =?UTF-8?q?=E5=8F=A3?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

---
 .../controller/EbikeBikeInfoController.java   | 18 +++++++----
 .../service/EbikeBikeInfoService.java         | 10 ++++++
 .../impl/EbikeBikeInfoServiceImpl.java        | 32 +++++++++++++++++++
 3 files changed, 54 insertions(+), 6 deletions(-)

diff --git a/ebike-maintenance/src/main/java/com/cdzy/ebikemaintenance/controller/EbikeBikeInfoController.java b/ebike-maintenance/src/main/java/com/cdzy/ebikemaintenance/controller/EbikeBikeInfoController.java
index 0afec50d..cae75994 100644
--- a/ebike-maintenance/src/main/java/com/cdzy/ebikemaintenance/controller/EbikeBikeInfoController.java
+++ b/ebike-maintenance/src/main/java/com/cdzy/ebikemaintenance/controller/EbikeBikeInfoController.java
@@ -24,10 +24,7 @@ import org.springframework.web.multipart.MultipartFile;
 
 import java.io.InputStream;
 import java.time.LocalDateTime;
-import java.util.ArrayList;
-import java.util.Arrays;
-import java.util.List;
-import java.util.UUID;
+import java.util.*;
 
 import static com.cdzy.ebikemaintenance.model.pojo.table.EbikeBatteryInfoTableDef.EBIKE_BATTERY_INFO;
 import static com.cdzy.ebikemaintenance.model.pojo.table.EbikeHelmetInfoTableDef.EBIKE_HELMET_INFO;
@@ -823,8 +820,17 @@ public class EbikeBikeInfoController {
     public JsonResult<?> updateVehicleStatus(@RequestBody ReqVehicleStatusUpdateDto request) {
         // 调用服务层方法，执行车辆状态修改操作
         return ebikeBikeInfoService.updateVehicleStatus(request);
-
-
+    }
+    /**
+     * 完成投放
+     *
+     * @param request 完成投放请求参数 orderId
+     * @return
+     */
+    @PostMapping("completeDeployment")
+    public JsonResult<?> completeDeployment(@RequestBody Map<String,Object> request) {
+        // 调用服务层方法，执行完成投放操作
+        return ebikeBikeInfoService.completeDeployment(request);
     }
 
 }
diff --git a/ebike-maintenance/src/main/java/com/cdzy/ebikemaintenance/service/EbikeBikeInfoService.java b/ebike-maintenance/src/main/java/com/cdzy/ebikemaintenance/service/EbikeBikeInfoService.java
index 41c75f08..aa4d60d6 100644
--- a/ebike-maintenance/src/main/java/com/cdzy/ebikemaintenance/service/EbikeBikeInfoService.java
+++ b/ebike-maintenance/src/main/java/com/cdzy/ebikemaintenance/service/EbikeBikeInfoService.java
@@ -11,6 +11,7 @@ import com.mybatisflex.core.paginate.Page;
 import com.mybatisflex.core.service.IService;
 
 import java.util.List;
+import java.util.Map;
 
 /**
  * 车辆基本信息 服务层。
@@ -278,4 +279,13 @@ public interface EbikeBikeInfoService extends IService<EbikeBikeInfo> {
      * @return
      */
     JsonResult<?> updateVehicleStatus(ReqVehicleStatusUpdateDto queryParam);
+
+
+    /**
+     * 完成投放
+     *
+     * @param param 完成投放请求参数 orderId
+     * @return
+     */
+    JsonResult<?> completeDeployment(Map<String,Object> param);
 }
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 05b614d0..fce3f4e3 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
@@ -1,6 +1,7 @@
 package com.cdzy.ebikemaintenance.service.impl;
 
 import cn.dev33.satoken.stp.StpUtil;
+import cn.hutool.core.map.MapUtil;
 import com.alibaba.fastjson2.JSONObject;
 import com.cdzy.common.enums.Code;
 import com.cdzy.common.model.CoreResult;
@@ -1334,6 +1335,37 @@ public class EbikeBikeInfoServiceImpl extends ServiceImpl<EbikeBikeInfoMapper, E
         } else {
             return JsonResult.failed("车辆状态修改失败");
         }
+    }
 
+    /**
+     * 完成投放
+     *
+     * @param param 完成投放请求参数 orderId
+     * @return
+     */
+    public JsonResult<?> completeDeployment(Map<String,Object> param) {
+
+        String orderId = MapUtil.getStr(param, "orderId");
+        //根据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);
+        List<EbikeDispatchRecords> ebikeDispatchRecords = ebikeDispatchRecordsMapper.selectListByQuery(query);
+        for (EbikeDispatchRecords ebikeDispatchRecord : ebikeDispatchRecords) {
+            ebikeDispatchRecord.setDispatchState("1");
+            ebikeDispatchRecordsMapper.update(ebikeDispatchRecord);
+            ReqVehicleStatusUpdateDto reqVehicleStatusUpdateDto = new ReqVehicleStatusUpdateDto();
+            reqVehicleStatusUpdateDto.setBikeCode(ebikeDispatchRecord.getBikeCode());
+            reqVehicleStatusUpdateDto.setState("2");
+            updateVehicleStatus(reqVehicleStatusUpdateDto);
+        }
+
+        return JsonResult.success("投放成功");
     }
 }