From eb7eaa2d831c31d998f50863998b5da177b62b27 Mon Sep 17 00:00:00 2001
From: attiya <2413103649@qq.com>
Date: Tue, 5 Aug 2025 16:07:37 +0800
Subject: [PATCH] =?UTF-8?q?=E6=89=B9=E9=87=8F=E6=8D=A2=E7=94=B5?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

---
 .../controller/EbikeOrderController.java      |  5 +++--
 .../dto/request/BatchBatteryOrderVo.java      |  5 +++++
 .../impl/EbikeBikeOrderServiceImpl.java       | 21 ++++++++++++-------
 3 files changed, 21 insertions(+), 10 deletions(-)

diff --git a/ebike-maintenance/src/main/java/com/cdzy/ebikemaintenance/controller/EbikeOrderController.java b/ebike-maintenance/src/main/java/com/cdzy/ebikemaintenance/controller/EbikeOrderController.java
index 1e289939..d6fa0f5d 100644
--- a/ebike-maintenance/src/main/java/com/cdzy/ebikemaintenance/controller/EbikeOrderController.java
+++ b/ebike-maintenance/src/main/java/com/cdzy/ebikemaintenance/controller/EbikeOrderController.java
@@ -4,6 +4,7 @@ import com.cdzy.common.model.JsonResult;
 import com.cdzy.ebikemaintenance.model.dto.request.BatchBatteryOrderVo;
 import com.cdzy.ebikemaintenance.service.EbikeBikeOrderService;
 import jakarta.annotation.Resource;
+import org.springframework.validation.annotation.Validated;
 import org.springframework.web.bind.annotation.*;
 
 /**
@@ -42,8 +43,8 @@ public class EbikeOrderController {
      * 批量领取换电工单
      * @return 结果
      */
-    @GetMapping("receiveBatchBatteryOrder")
-    public JsonResult<?> receiveBatchBatteryOrder(@RequestBody BatchBatteryOrderVo batteryOrderVo) {
+    @PostMapping("receiveBatchBatteryOrder")
+    public JsonResult<?> receiveBatchBatteryOrder(@RequestBody @Validated BatchBatteryOrderVo batteryOrderVo) {
         ebikeBikeOrderService.receiveBatchBatteryOrder(batteryOrderVo.getBikeIds());
         return JsonResult.success();
     }
diff --git a/ebike-maintenance/src/main/java/com/cdzy/ebikemaintenance/model/dto/request/BatchBatteryOrderVo.java b/ebike-maintenance/src/main/java/com/cdzy/ebikemaintenance/model/dto/request/BatchBatteryOrderVo.java
index fd716b2c..c343d171 100644
--- a/ebike-maintenance/src/main/java/com/cdzy/ebikemaintenance/model/dto/request/BatchBatteryOrderVo.java
+++ b/ebike-maintenance/src/main/java/com/cdzy/ebikemaintenance/model/dto/request/BatchBatteryOrderVo.java
@@ -1,5 +1,7 @@
 package com.cdzy.ebikemaintenance.model.dto.request;
 
+import jakarta.validation.constraints.NotNull;
+import jakarta.validation.constraints.Size;
 import lombok.Data;
 
 import java.util.List;
@@ -10,5 +12,8 @@ import java.util.List;
  */
 @Data
 public class BatchBatteryOrderVo {
+
+    @NotNull(message = "车辆ID集合不能为空")
+    @Size(min = 1,message = "车辆ID集合最小Size为1")
     private List<String> bikeIds;
 }
diff --git a/ebike-maintenance/src/main/java/com/cdzy/ebikemaintenance/service/impl/EbikeBikeOrderServiceImpl.java b/ebike-maintenance/src/main/java/com/cdzy/ebikemaintenance/service/impl/EbikeBikeOrderServiceImpl.java
index 742feb26..1f924032 100644
--- a/ebike-maintenance/src/main/java/com/cdzy/ebikemaintenance/service/impl/EbikeBikeOrderServiceImpl.java
+++ b/ebike-maintenance/src/main/java/com/cdzy/ebikemaintenance/service/impl/EbikeBikeOrderServiceImpl.java
@@ -48,6 +48,9 @@ public class EbikeBikeOrderServiceImpl extends ServiceImpl<EbikeBikeOrderMapper,
                         .leftJoin(EBIKE_ECU_INFO).on(EBIKE_ECU_INFO.ECU_ID.eq(EBIKE_BIKE_INFO.ECU_ID))
                         .where(EBIKE_ECU_INFO.ECU_SN.eq(ecuSn));
         EbikeBikeInfo ebikeBikeInfo = infoMapper.selectOneByQuery(queryWrapper);
+        if (ebikeBikeInfo == null) {
+            throw new RuntimeException("该车辆不存在");
+        }
         queryWrapper.clear();
         queryWrapper.where(EBIKE_BIKE_ORDER.BIKE_ID.eq(ebikeBikeInfo.getBikeId()))
                 .where(EBIKE_BIKE_ORDER.ORDER_TYPE.eq("2"))
@@ -114,17 +117,19 @@ public class EbikeBikeOrderServiceImpl extends ServiceImpl<EbikeBikeOrderMapper,
         }
         Long staffId = jsonResult.getData().getStaffId();
         QueryWrapper queryWrapper = QueryWrapper.create()
+                .select(EBIKE_BIKE_ORDER.ORDER_ID)
                 .where(EBIKE_BIKE_ORDER.BIKE_ID.in(bikeIds))
                 .where(EBIKE_BIKE_ORDER.RECEIVER_ID.isNull())
                 .where(EBIKE_BIKE_ORDER.ORDER_TYPE.eq("2"))
                 .where(EBIKE_BIKE_ORDER.HANDLE_STATE.eq("0"));
-        List<EbikeBikeOrder> list = this.mapper.selectListByQuery(queryWrapper);
-        List<String> strings = list.stream().map(EbikeBikeOrder::getOrderId).toList();
-        UpdateChain.of(EBIKE_BIKE_ORDER)
-                .set(EBIKE_BIKE_ORDER.RECEIVER_ID,staffId)
-                .where(EBIKE_BIKE_ORDER.ORDER_ID.in(strings))
-                .where(EBIKE_BIKE_ORDER.RECEIVER_ID.isNull())
-                .where(EBIKE_BIKE_ORDER.ORDER_TYPE.eq("2"))
-                .where(EBIKE_BIKE_ORDER.HANDLE_STATE.eq("0"));
+        List<String> list = this.mapper.selectListByQueryAs(queryWrapper,String.class);
+        if (list != null && !list.isEmpty()){
+            UpdateChain.of(EBIKE_BIKE_ORDER)
+                    .set(EBIKE_BIKE_ORDER.RECEIVER_ID,staffId)
+                    .where(EBIKE_BIKE_ORDER.ORDER_ID.in(list))
+                    .where(EBIKE_BIKE_ORDER.RECEIVER_ID.isNull())
+                    .where(EBIKE_BIKE_ORDER.ORDER_TYPE.eq("2"))
+                    .where(EBIKE_BIKE_ORDER.HANDLE_STATE.eq("0"));
+        }
     }
 }