From f7602978be39464ad5bd66001b3d426ccae9db89271e12000f0343cf64317619 Mon Sep 17 00:00:00 2001
From: PC <2413103649@qq.com>
Date: Mon, 2 Feb 2026 15:37:26 +0800
Subject: [PATCH] =?UTF-8?q?=E8=BD=A6=E8=BE=86=E7=AD=9B=E9=80=89?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

---
 .../operations/controller/EbikeBikeOrderController.java     | 4 ++--
 .../com/cdzy/operations/service/EbikeBikeOrderService.java  | 2 +-
 .../operations/service/impl/EbikeBikeOrderServiceImpl.java  | 6 +++++-
 3 files changed, 8 insertions(+), 4 deletions(-)

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 45fe444..8cb9832 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
@@ -283,8 +283,8 @@ public class EbikeBikeOrderController {
      * @return 操作结果
      */
     @GetMapping("bikeList")
-    public JsonResult<List<EbikeOrderBikeListDto>> bikeList(@RequestParam("regionId") Long regionId,String bikeCode,Integer bikeStatus,Boolean acceptOrder) throws IOException {
-        List<EbikeOrderBikeListDto> list = ebikeBikeOrderService.bikeList(regionId,bikeCode,bikeStatus,acceptOrder);
+    public JsonResult<List<EbikeOrderBikeListDto>> bikeList(@RequestParam("regionId") Long regionId,String bikeCode,Integer bikeStatus,Boolean acceptOrder,Integer orderType) throws IOException {
+        List<EbikeOrderBikeListDto> list = ebikeBikeOrderService.bikeList(regionId,bikeCode,bikeStatus,acceptOrder,orderType);
         return JsonResult.success(list);
     }
 
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 de9838f..bce732d 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
@@ -102,7 +102,7 @@ public interface EbikeBikeOrderService extends IService<EbikeBikeOrder> {
      * @param regionId 运营区ID
      * @return 列表
      */
-    List<EbikeOrderBikeListDto> bikeList(Long regionId,String bikeCode,Integer bikeStatus,Boolean acceptOrder) throws IOException;
+    List<EbikeOrderBikeListDto> bikeList(Long regionId,String bikeCode,Integer bikeStatus,Boolean acceptOrder,Integer orderType) throws IOException;
 
     /**
      * 完成调度
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 901d7f4..86d50ec 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
@@ -506,7 +506,7 @@ public class EbikeBikeOrderServiceImpl extends ServiceImpl<EbikeBikeOrderMapper,
     }
 
     @Override
-    public List<EbikeOrderBikeListDto> bikeList(Long regionId,String bikeCode,Integer bikeStatus,Boolean acceptOrder) throws IOException {
+    public List<EbikeOrderBikeListDto> bikeList(Long regionId,String bikeCode,Integer bikeStatus,Boolean acceptOrder,Integer orderType) throws IOException {
 
         QueryWrapper queryWrapper = QueryWrapper.create()
                 .select(
@@ -593,6 +593,10 @@ public class EbikeBikeOrderServiceImpl extends ServiceImpl<EbikeBikeOrderMapper,
             queryWrapper.leftJoin(EBIKE_BIKE_ORDER).on(EBIKE_BIKE_ORDER.BIKE_CODE.eq(EBIKE_BIKE_INFO.BIKE_CODE))
                     .where(EBIKE_BIKE_ORDER.HANDLE_STATE.eq(OrderHandleState.UNPROCESSED).or(EBIKE_BIKE_ORDER.HANDLE_STATE.eq(OrderHandleState.ACCEPTED)))
                     .where(EBIKE_BIKE_ORDER.RECEIVER_ID.eq(StpUtil.getLoginIdAsLong()));
+        } else if (orderType!=null) {
+            queryWrapper.leftJoin(EBIKE_BIKE_ORDER).on(EBIKE_BIKE_ORDER.BIKE_CODE.eq(EBIKE_BIKE_INFO.BIKE_CODE))
+                    .where(EBIKE_BIKE_ORDER.HANDLE_STATE.eq(OrderHandleState.UNPROCESSED).or(EBIKE_BIKE_ORDER.HANDLE_STATE.eq(OrderHandleState.ACCEPTED)))
+                    .where(EBIKE_BIKE_ORDER.ORDER_TYPE.eq(orderType));
         }
         List<EbikeOrderBikeListDto> list = bikeInfoMapper.selectListByQueryAs(queryWrapper, EbikeOrderBikeListDto.class);
         List<String> snList = list.stream().map(EbikeOrderBikeListDto::getEcuSn).toList();