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 46d28fe..e4a53a8 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
@@ -818,8 +818,8 @@ public class EbikeBikeOrderServiceImpl extends ServiceImpl<EbikeBikeOrderMapper,
                 .select(EBIKE_BIKE_INFO.OPERATOR_ID)
                 .where(EBIKE_BIKE_INFO.BIKE_CODE.in(bikeCodes))
                 .groupBy(EBIKE_BIKE_INFO.OPERATOR_ID);
-        long count = bikeInfoMapper.selectCountByQuery(queryWrapper);
-        if (count > 1) {
+        List<Long> countList = bikeInfoMapper.selectListByQueryAs(queryWrapper,Long.class);
+        if (countList.size() > 1) {
             throw new EbikeException("该列表中同时存在不同运营商的车辆");
         }
         queryWrapper.clear();
@@ -839,6 +839,7 @@ public class EbikeBikeOrderServiceImpl extends ServiceImpl<EbikeBikeOrderMapper,
                     .build();
             if (dispatchSwapVo.getAcceptOrders()) {
                 ebikeBikeOrder.setReceiverId(staffId);
+                ebikeBikeOrder.setHandleState(OrderHandleState.ACCEPTED);
             }
             list.add(ebikeBikeOrder);
         }