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 209c563f..77f403a2 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
@@ -22,7 +22,7 @@ public class EbikeOrderController {
 
     /**
      * 生成换电工单
-     * @return 运营车辆列表
+     * @return 结果
      */
     @GetMapping("changeBattery")
     public JsonResult<?> changeBattery(@RequestParam("ecuSn") String ecuSn) {
@@ -30,4 +30,13 @@ public class EbikeOrderController {
         return JsonResult.success();
     }
 
+    /**
+     * 领取换电工单
+     * @return 结果
+     */
+    @GetMapping("receiveBatteryOrder")
+    public JsonResult<?> receiveBatteryOrder(@RequestParam("bikeId") Long bikeId) {
+        ebikeBikeOrderService.receiveBatteryOrder(bikeId);
+        return JsonResult.success();
+    }
 }
diff --git a/ebike-maintenance/src/main/java/com/cdzy/ebikemaintenance/service/EbikeBikeOrderService.java b/ebike-maintenance/src/main/java/com/cdzy/ebikemaintenance/service/EbikeBikeOrderService.java
index 97884efd..97a84729 100644
--- a/ebike-maintenance/src/main/java/com/cdzy/ebikemaintenance/service/EbikeBikeOrderService.java
+++ b/ebike-maintenance/src/main/java/com/cdzy/ebikemaintenance/service/EbikeBikeOrderService.java
@@ -23,4 +23,10 @@ public interface EbikeBikeOrderService extends IService<EbikeBikeOrder> {
      * @param receiverId 处理人ID
      */
     String doneChangeBattery(String bikeId,String receiverId);
+
+    /**
+     * 领取换电工单
+     * @param bikeId 车辆ID
+     */
+    void receiveBatteryOrder(Long bikeId);
 }
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 12dc5aba..cb6bffff 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
@@ -1,10 +1,15 @@
 package com.cdzy.ebikemaintenance.service.impl;
 
+import cn.dev33.satoken.stp.StpUtil;
+import com.cdzy.common.enums.Code;
+import com.cdzy.common.model.JsonResult;
 import com.cdzy.ebikemaintenance.mapper.EbikeBikeInfoMapper;
 import com.cdzy.ebikemaintenance.mapper.EbikeBikeOrderMapper;
 import com.cdzy.ebikemaintenance.model.pojo.EbikeBikeInfo;
 import com.cdzy.ebikemaintenance.model.pojo.EbikeBikeOrder;
 import com.cdzy.ebikemaintenance.service.EbikeBikeOrderService;
+import com.ebike.feign.clients.StaffFeignClient;
+import com.ebike.feign.model.rsp.StaffFeign;
 import com.mybatisflex.core.keygen.impl.SnowFlakeIDKeyGenerator;
 import com.mybatisflex.core.query.QueryWrapper;
 import com.mybatisflex.spring.service.impl.ServiceImpl;
@@ -31,6 +36,9 @@ public class EbikeBikeOrderServiceImpl extends ServiceImpl<EbikeBikeOrderMapper,
     @Resource
     EbikeBikeInfoMapper infoMapper;
 
+    @Resource
+    StaffFeignClient staffFeignClient;
+
     @Override
     public void changeBattery(String ecuSn) {
         QueryWrapper queryWrapper = QueryWrapper.create()
@@ -58,6 +66,7 @@ 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);
@@ -66,8 +75,25 @@ public class EbikeBikeOrderServiceImpl extends ServiceImpl<EbikeBikeOrderMapper,
         }
         bikeOrder.setHandleState("1");
         bikeOrder.setHandleAt(LocalDateTime.now());
-        bikeOrder.setReceiverId(receiverId);
         this.mapper.update(bikeOrder);
         return bikeOrder.getOrderId();
     }
+
+    @Override
+    public void receiveBatteryOrder(Long bikeId) {
+        String tokenValue = StpUtil.getTokenValue();
+        JsonResult<StaffFeign> jsonResult = staffFeignClient.getInfoByToken(tokenValue);
+        if (jsonResult.getCode() == Code.SUCCESS){
+            throw new RuntimeException("获取用户信息失败");
+        }
+        Long staffId = jsonResult.getData().getStaffId();
+        QueryWrapper queryWrapper = QueryWrapper.create()
+                .where(EBIKE_BIKE_ORDER.BIKE_ID.eq(bikeId))
+                .where(EBIKE_BIKE_ORDER.RECEIVER_ID.isNull())
+                .where(EBIKE_BIKE_ORDER.ORDER_TYPE.eq("2"))
+                .where(EBIKE_BIKE_ORDER.HANDLE_STATE.eq("0"));
+        EbikeBikeOrder bikeOrder = this.mapper.selectOneByQuery(queryWrapper);
+        bikeOrder.setReceiverId(String.valueOf(staffId));
+        this.mapper.update(bikeOrder);
+    }
 }