From d3a2882c991eb335e37471c5c29eb29351d89af4b2bdb981ea64ac907d45a85e Mon Sep 17 00:00:00 2001
From: PC <2413103649@qq.com>
Date: Mon, 2 Feb 2026 15:33:00 +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

---
 .../controller/EbikeBikeOrderController.java           |  4 ++--
 .../cdzy/operations/service/EbikeBikeOrderService.java |  2 +-
 .../service/impl/EbikeBikeOrderServiceImpl.java        | 10 +++++++++-
 3 files changed, 12 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 7f65a78..45fe444 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) throws IOException {
-        List<EbikeOrderBikeListDto> list = ebikeBikeOrderService.bikeList(regionId);
+    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);
         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 a841f99..de9838f 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) throws IOException;
+    List<EbikeOrderBikeListDto> bikeList(Long regionId,String bikeCode,Integer bikeStatus,Boolean acceptOrder) 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 d3119fa..901d7f4 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
@@ -20,6 +20,7 @@ import com.mybatisflex.core.keygen.impl.SnowFlakeIDKeyGenerator;
 import com.mybatisflex.core.query.QueryMethods;
 import com.mybatisflex.core.query.QueryWrapper;
 import com.mybatisflex.core.update.UpdateChain;
+import com.mybatisflex.core.util.StringUtil;
 import com.mybatisflex.spring.service.impl.ServiceImpl;
 import jakarta.annotation.Resource;
 import lombok.extern.slf4j.Slf4j;
@@ -505,7 +506,7 @@ public class EbikeBikeOrderServiceImpl extends ServiceImpl<EbikeBikeOrderMapper,
     }
 
     @Override
-    public List<EbikeOrderBikeListDto> bikeList(Long regionId) throws IOException {
+    public List<EbikeOrderBikeListDto> bikeList(Long regionId,String bikeCode,Integer bikeStatus,Boolean acceptOrder) throws IOException {
 
         QueryWrapper queryWrapper = QueryWrapper.create()
                 .select(
@@ -585,7 +586,14 @@ public class EbikeBikeOrderServiceImpl extends ServiceImpl<EbikeBikeOrderMapper,
                 .select("EXTRACT(EPOCH FROM (NOW() -  ebike_bike_info.latest_cycling_time)) / 3600 AS hours_since_last_cycling")
                 .where(EBIKE_BIKE_INFO.REGION_ID.eq(regionId))
                 .where(EBIKE_BIKE_INFO.STATUS.eq(BikeStatus.LAUNCH))
+                .where(EBIKE_BIKE_INFO.BIKE_CODE.eq(bikeCode, StringUtil.hasText(bikeCode)))
+                .where(EBIKE_BIKE_INFO.USAGE_STATUS.eq(bikeStatus, Objects.nonNull(bikeStatus)))
                 .leftJoin(EBIKE_ECU_INFO).on(EBIKE_ECU_INFO.ECU_ID.eq(EBIKE_BIKE_INFO.ECU_ID));
+        if (acceptOrder!=null && acceptOrder){
+            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()));
+        }
         List<EbikeOrderBikeListDto> list = bikeInfoMapper.selectListByQueryAs(queryWrapper, EbikeOrderBikeListDto.class);
         List<String> snList = list.stream().map(EbikeOrderBikeListDto::getEcuSn).toList();
         Map<String, Object> objectMap = redisUtil.batchGetEcuWithMap(snList);