From 754848d33c855bfccd40f25a67cde9b61786cb6d6c9b92ca94723955ebff10ef Mon Sep 17 00:00:00 2001
From: yanglei <yanglei@stargraph.cn>
Date: Fri, 27 Feb 2026 14:22:34 +0800
Subject: [PATCH] =?UTF-8?q?=E4=BB=A3=E7=A0=81=E4=BC=98=E5=8C=96?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

---
 .../user/service/impl/EbikeOrderServiceImpl.java  | 15 ++++++++-------
 1 file changed, 8 insertions(+), 7 deletions(-)

diff --git a/ebike-user/src/main/java/com/cdzy/user/service/impl/EbikeOrderServiceImpl.java b/ebike-user/src/main/java/com/cdzy/user/service/impl/EbikeOrderServiceImpl.java
index 657e5f7..5636450 100644
--- a/ebike-user/src/main/java/com/cdzy/user/service/impl/EbikeOrderServiceImpl.java
+++ b/ebike-user/src/main/java/com/cdzy/user/service/impl/EbikeOrderServiceImpl.java
@@ -83,7 +83,7 @@ import static com.cdzy.user.model.entity.table.EbikeRefundTableDef.EBIKE_REFUND;
 public class EbikeOrderServiceImpl extends ServiceImpl<EbikeOrderMapper, EbikeOrder> implements EbikeOrderService {
 
     @Resource
-    private EbikeOrderMapper ebikeOrderTransactionMapper;
+    private EbikeOrderMapper orderMapper;
 
     @Resource
     private OperationsFeignClient operationsFeignClient;
@@ -103,7 +103,7 @@ public class EbikeOrderServiceImpl extends ServiceImpl<EbikeOrderMapper, EbikeOr
         Long userId = orderDto.getUserId();
         String bikeCode = orderDto.getBikeCode();
         // 校验用户当前是否存在订单
-        EbikeOrder history = checkExitHistoryOrder(userId);
+        EbikeOrder history = checkExistHistoryOrder(userId);
         if (Objects.nonNull(history)) {
             if (history.getOrderStatus() == OrderStatus.IN_PROGRESS) {
                 throw new EbikeException("请完成当前订单后再试");
@@ -402,7 +402,7 @@ public class EbikeOrderServiceImpl extends ServiceImpl<EbikeOrderMapper, EbikeOr
         QueryWrapper queryWrapper = QueryWrapper.create()
                 .where(EBIKE_ORDER.BIKE_CODE.eq(dto.getBikeCode()))
                 .where(EBIKE_ORDER.ORDER_STATUS.eq(OrderStatus.IN_PROGRESS));
-        EbikeOrder order = ebikeOrderTransactionMapper.selectOneByQuery(queryWrapper);
+        EbikeOrder order = orderMapper.selectOneByQuery(queryWrapper);
         if (Objects.isNull(order)) {
             throw new EbikeException("当前车辆不存在骑行订单");
         }
@@ -600,18 +600,19 @@ public class EbikeOrderServiceImpl extends ServiceImpl<EbikeOrderMapper, EbikeOr
                 .where(EBIKE_ORDER.BIKE_CODE.eq(endDto.getBikeCode()))
                 .where(EBIKE_ORDER.USER_ID.eq(endDto.getUserId()))
                 .where(EBIKE_ORDER.ORDER_STATUS.eq(OrderStatus.IN_PROGRESS));
-        EbikeOrder userOrders = ebikeOrderTransactionMapper.selectOneByQuery(queryWrapper);
+        EbikeOrder userOrders = orderMapper.selectOneByQuery(queryWrapper);
         if (userOrders == null) {
             throw new EbikeException("该订单不存在");
         }
         return userOrders;
     }
 
-    private EbikeOrder checkExitHistoryOrder(Long userId) {
+    private EbikeOrder checkExistHistoryOrder(Long userId) {
         QueryWrapper queryWrapper = QueryWrapper.create()
                 .where(EBIKE_ORDER.USER_ID.eq(userId))
-                .where(EBIKE_ORDER.ORDER_STATUS.eq(OrderStatus.IN_PROGRESS).or(EBIKE_ORDER.ORDER_STATUS.eq(OrderStatus.PENDING_PAYMENT)));
-        return ebikeOrderTransactionMapper.selectOneByQuery(queryWrapper);
+                .where(EBIKE_ORDER.ORDER_STATUS.in(OrderStatus.IN_PROGRESS, OrderStatus.PENDING_PAYMENT))
+                .limit(1);
+        return orderMapper.selectOneByQuery(queryWrapper);
     }
 
     /**