From c310909f6bb68354ebb824e5cf409f3134e6235e Mon Sep 17 00:00:00 2001
From: attiya <2413103649@qq.com>
Date: Mon, 19 May 2025 09:48:00 +0800
Subject: [PATCH] =?UTF-8?q?=E9=A2=86=E5=8F=96=E6=8D=A2=E7=94=B5=E5=B7=A5?=
 =?UTF-8?q?=E5=8D=95=EF=BC=9A=E8=B0=83=E6=95=B4=E5=AE=8C=E6=88=90=E6=8D=A2?=
 =?UTF-8?q?=E7=94=B5=E5=B7=A5=E5=8D=95=E6=AD=A5=E9=AA=A4?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

---
 .../service/impl/EbikeBikeOrderServiceImpl.java              | 5 ++++-
 1 file changed, 4 insertions(+), 1 deletion(-)

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 cb6bffff..ee0ec834 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
@@ -17,6 +17,7 @@ import jakarta.annotation.Resource;
 import org.springframework.stereotype.Service;
 
 import java.time.LocalDateTime;
+import java.util.Objects;
 
 import static com.cdzy.ebikemaintenance.model.pojo.table.EbikeBikeInfoTableDef.EBIKE_BIKE_INFO;
 import static com.cdzy.ebikemaintenance.model.pojo.table.EbikeBikeOrderTableDef.EBIKE_BIKE_ORDER;
@@ -66,13 +67,15 @@ public class EbikeBikeOrderServiceImpl extends ServiceImpl<EbikeBikeOrderMapper,
     public String doneChangeBattery(String bikeId, String receiverId) {
         QueryWrapper queryWrapper = QueryWrapper.create()
                 .where(EBIKE_BIKE_ORDER.BIKE_ID.eq(bikeId))
-                .where(EBIKE_BIKE_ORDER.RECEIVER_ID.eq(receiverId))
                 .where(EBIKE_BIKE_ORDER.ORDER_TYPE.eq("2"))
                 .where(EBIKE_BIKE_ORDER.HANDLE_STATE.eq("0"));
         EbikeBikeOrder bikeOrder = this.mapper.selectOneByQuery(queryWrapper);
         if (bikeOrder == null){
             throw new RuntimeException("该车辆不存在未完成的换电工单");
         }
+        if (!Objects.equals(bikeOrder.getReceiverId(), receiverId)){
+            throw new RuntimeException("该员工未领取该车辆的换电工单");
+        }
         bikeOrder.setHandleState("1");
         bikeOrder.setHandleAt(LocalDateTime.now());
         this.mapper.update(bikeOrder);