From d2ddb03ee094d1d546fd92ce1b7876a7d3ae0657 Mon Sep 17 00:00:00 2001
From: puzhibing <393733352@qq.com>
Date: 星期四, 12 三月 2026 20:09:12 +0800
Subject: [PATCH] Merge remote-tracking branch 'origin/master'
---
xp-robotaxi-order-boot/src/main/java/com/xiaopeng/order/service/impl/XpOrderServiceImpl.java | 24 ++++++++++++++++++++----
1 files changed, 20 insertions(+), 4 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 977813b..8aeb326 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
@@ -207,7 +207,14 @@
return buildEmptyOrderPage(query);
}
}
-
+ if (StringUtils.isNotBlank(query.getNickName())) {
+ //根据手机号查询用户信息
+ UcUserInfo userByMobile = userResourcesClient.getUserByMobile(query.getNickName());
+ if (userByMobile == null || userByMobile.getId() == null) {
+ return buildEmptyOrderPage(query);
+ }
+ query.setUid(userByMobile.getId());
+ }
// 1. 构建查询条件
LambdaQueryWrapper<XpOrder> wrapper = buildQueryWrapper(query);
if (CollUtil.isNotEmpty(vehicleIdsFilter)) {
@@ -350,7 +357,14 @@
}
wrapper.in(XpOrder::getVehicleId, vehicleIdsFilter);
}
-
+ if (StringUtils.isNotBlank(query.getNickName())) {
+ //根据手机号查询用户信息
+ UcUserInfo userByMobile = userResourcesClient.getUserByMobile(query.getNickName());
+ if (userByMobile == null || userByMobile.getId() == null) {
+ return new ArrayList<>();
+ }
+ query.setUid(userByMobile.getId());
+ }
// 2. 查询订单列表
List<XpOrder> orderList = this.list(wrapper);
@@ -394,7 +408,8 @@
wrapper.like(StringUtils.isNotBlank(query.getOrderNumber()), XpOrder::getOrderNumber, query.getOrderNumber())
.eq(Objects.nonNull(query.getFleetId()), XpOrder::getFleetId, query.getFleetId())
.eq(Objects.nonNull(query.getOrderSource()), XpOrder::getOrderSource, query.getOrderSource())
- .eq(Objects.nonNull(query.getStatus()), XpOrder::getStatus, query.getStatus());
+ .eq(Objects.nonNull(query.getStatus()), XpOrder::getStatus, query.getStatus())
+ .eq(Objects.nonNull(query.getUid()), XpOrder::getAppUserId, query.getUid());
RegionCodeFilterUtil.resolveCityCodeFilter(query.getCityCode())
.ifPresent(filter -> {
@@ -421,7 +436,8 @@
wrapper.like(StringUtils.isNotBlank(query.getOrderNumber()), XpOrder::getOrderNumber, query.getOrderNumber())
.eq(Objects.nonNull(query.getFleetId()), XpOrder::getFleetId, query.getFleetId())
.eq(Objects.nonNull(query.getOrderSource()), XpOrder::getOrderSource, query.getOrderSource())
- .eq(Objects.nonNull(query.getStatus()), XpOrder::getStatus, query.getStatus());
+ .eq(Objects.nonNull(query.getStatus()), XpOrder::getStatus, query.getStatus())
+ .eq(Objects.nonNull(query.getUid()), XpOrder::getAppUserId, query.getUid());
RegionCodeFilterUtil.resolveCityCodeFilter(query.getCityCode())
.ifPresent(filter -> {
--
Gitblit v1.7.1