From aa295bef419c7684862cfdfa427850a64892d0c7 Mon Sep 17 00:00:00 2001
From: Pu Zhibing <393733352@qq.com>
Date: 星期五, 07 二月 2025 15:57:40 +0800
Subject: [PATCH] Merge remote-tracking branch 'origin/master'
---
ruoyi-service/ruoyi-order/src/main/java/com/ruoyi/order/service/impl/OrderServiceImpl.java | 9 +++++++--
1 files changed, 7 insertions(+), 2 deletions(-)
diff --git a/ruoyi-service/ruoyi-order/src/main/java/com/ruoyi/order/service/impl/OrderServiceImpl.java b/ruoyi-service/ruoyi-order/src/main/java/com/ruoyi/order/service/impl/OrderServiceImpl.java
index 81f0d2c..95748ea 100644
--- a/ruoyi-service/ruoyi-order/src/main/java/com/ruoyi/order/service/impl/OrderServiceImpl.java
+++ b/ruoyi-service/ruoyi-order/src/main/java/com/ruoyi/order/service/impl/OrderServiceImpl.java
@@ -325,11 +325,14 @@
// 处理用户电话搜索条件
processAppUserIds(orderPageList, orderPageList.getPhone(), appUserClient::getAppUserByPhoneNoFilter);
+ if (orderPageList.getAppUserIds() == null) {
+ return new PageInfo<>();
+ }
+
// 去重 appUserIds
- Optional.ofNullable(orderPageList.getAppUserIds())
+ Optional.of(orderPageList.getAppUserIds())
.ifPresent(ids -> orderPageList.setAppUserIds(ids.stream().distinct().collect(Collectors.toList())));
- log.error("orderPageList:"+orderPageList.getAppUserIds());
// 分页查询订单列表
PageInfo<OrderPageListVo> pageInfo = new PageInfo<>(orderPageList.getPageCurr(), orderPageList.getPageSize());
List<OrderPageListVo> list = this.baseMapper.getOrderPageList(pageInfo, orderPageList);
@@ -398,6 +401,8 @@
orderPageListVo.setExpressCompany(ExpressCompanyMap.getCompanyNameByCode(jsonObject.getString("com")));
orderPageListVo.setExpressNum(jsonObject.getString("num"));
} catch (Exception e) {
+ e.printStackTrace();
+ throw new RuntimeException("快递信息解析失败");
}
});
}
--
Gitblit v1.7.1