diff --git a/ebike-operations/src/main/java/com/cdzy/operations/controller/EbikeBikeOrderController.java b/ebike-operations/src/main/java/com/cdzy/operations/controller/EbikeBikeOrderController.java
index 1f47f95..acc9fd9 100644
--- a/ebike-operations/src/main/java/com/cdzy/operations/controller/EbikeBikeOrderController.java
+++ b/ebike-operations/src/main/java/com/cdzy/operations/controller/EbikeBikeOrderController.java
@@ -97,8 +97,8 @@ public class EbikeBikeOrderController {
      * @return 结果
      */
     @GetMapping("batterySwapOrder")
-    public JsonResult<?> batterySwapOrder(@NotNull(message = "中控编号不能为空") String ecuSn) {
-        ebikeBikeOrderService.createBatterySwapOrder(ecuSn);
+    public JsonResult<?> batterySwapOrder(@NotNull(message = "中控编号不能为空") String ecuSn,@NotNull(message= "是否接单不能为空")Boolean acceptOrder) {
+        ebikeBikeOrderService.createBatterySwapOrder(ecuSn,acceptOrder);
         return JsonResult.success();
     }
 
diff --git a/ebike-operations/src/main/java/com/cdzy/operations/service/EbikeBikeOrderService.java b/ebike-operations/src/main/java/com/cdzy/operations/service/EbikeBikeOrderService.java
index 50784f1..a841f99 100644
--- a/ebike-operations/src/main/java/com/cdzy/operations/service/EbikeBikeOrderService.java
+++ b/ebike-operations/src/main/java/com/cdzy/operations/service/EbikeBikeOrderService.java
@@ -22,8 +22,9 @@ public interface EbikeBikeOrderService extends IService<EbikeBikeOrder> {
     /**
      * 根据中控编码（EcuSn）生成车辆换电工单
      * @param ecuSn 中控编码
+     * @param acceptOrder 是否自己接单
      */
-    void createBatterySwapOrder(String ecuSn);
+    void createBatterySwapOrder(String ecuSn,Boolean acceptOrder);
 
 
     /**
diff --git a/ebike-operations/src/main/java/com/cdzy/operations/service/impl/EbikeBikeOrderServiceImpl.java b/ebike-operations/src/main/java/com/cdzy/operations/service/impl/EbikeBikeOrderServiceImpl.java
index d6f21b7..0704e5e 100644
--- a/ebike-operations/src/main/java/com/cdzy/operations/service/impl/EbikeBikeOrderServiceImpl.java
+++ b/ebike-operations/src/main/java/com/cdzy/operations/service/impl/EbikeBikeOrderServiceImpl.java
@@ -105,7 +105,7 @@ public class EbikeBikeOrderServiceImpl extends ServiceImpl<EbikeBikeOrderMapper,
     private EbikeDispatchConfigurationMapper ebikeDispatchConfigurationMapper;
 
     @Override
-    public void createBatterySwapOrder(String ecuSn) {
+    public void createBatterySwapOrder(String ecuSn,Boolean acceptOrder) {
         QueryWrapper queryWrapper = QueryWrapper.create()
                 .select(EBIKE_BIKE_INFO.ALL_COLUMNS)
                 .where(EBIKE_ECU_INFO.ECU_SN.eq(ecuSn))
@@ -131,6 +131,9 @@ public class EbikeBikeOrderServiceImpl extends ServiceImpl<EbikeBikeOrderMapper,
                 .operatorId(bikeInfo.getOperatorId())
                 .handleState(OrderHandleState.UNPROCESSED)
                 .build();
+        if (acceptOrder){
+            ebikeBikeOrder.setReceiverId(StpUtil.getLoginIdAsLong());
+        }
         this.mapper.insert(ebikeBikeOrder);
         //换电不处理车辆状态，电量低时用户不允许开锁
     }