From 164f20125c9da1d8992bd2752a3d8307446ae435 Mon Sep 17 00:00:00 2001
From: “mitao” <“2763622819@qq.com”>
Date: 星期六, 14 三月 2026 23:26:57 +0800
Subject: [PATCH] bugfix

---
 xp-robotaxi-order-boot/src/main/java/com/xiaopeng/order/service/impl/XpOrderServiceImpl.java |    7 +++++--
 1 files changed, 5 insertions(+), 2 deletions(-)

diff --git a/xp-robotaxi-order-boot/src/main/java/com/xiaopeng/order/service/impl/XpOrderServiceImpl.java b/xp-robotaxi-order-boot/src/main/java/com/xiaopeng/order/service/impl/XpOrderServiceImpl.java
index 58af009..41a0700 100644
--- a/xp-robotaxi-order-boot/src/main/java/com/xiaopeng/order/service/impl/XpOrderServiceImpl.java
+++ b/xp-robotaxi-order-boot/src/main/java/com/xiaopeng/order/service/impl/XpOrderServiceImpl.java
@@ -216,13 +216,14 @@
             if (userByMobile == null || userByMobile.getId() == null) {
                 return buildEmptyOrderPage(query);
             }
-            query.setUid(userByMobile.getId());
+            query.setUid(userByMobile.getUid());
         }
         // 1. 构建查询条件
         LambdaQueryWrapper<XpOrder> wrapper = buildQueryWrapper(query);
         if (CollUtil.isNotEmpty(vehicleIdsFilter)) {
             wrapper.in(XpOrder::getVehicleId, vehicleIdsFilter);
         }
+        wrapper.eq(Objects.nonNull(query.getUid()), XpOrder::getAppUserId, query.getUid());
         wrapper.orderByDesc(XpOrder::getCreateTime);
 
         // 2. 分页查询
@@ -366,8 +367,10 @@
             if (userByMobile == null || userByMobile.getId() == null) {
                 return new ArrayList<>();
             }
-            query.setUid(userByMobile.getId());
+            query.setUid(userByMobile.getUid());
         }
+        wrapper.eq(Objects.nonNull(query.getUid()), XpOrder::getAppUserId, query.getUid());
+        wrapper.orderByDesc(XpOrder::getCreateTime);
         // 2. 查询订单列表
         List<XpOrder> orderList = this.list(wrapper);
 

--
Gitblit v1.7.1