From bfa6af3b50fa16ed4f1d835f8f9fc9237c83e64c Mon Sep 17 00:00:00 2001
From: xuhy <3313886187@qq.com>
Date: 星期日, 27 四月 2025 17:26:32 +0800
Subject: [PATCH] Merge branch 'dev' of http://120.76.84.145:10101/gitblit/r/java/JiaDianHuiShou into dev
---
ruoyi-service/ruoyi-admin/src/main/java/com/ruoyi/admin/service/impl/OrderServiceImpl.java | 6 +++---
1 files changed, 3 insertions(+), 3 deletions(-)
diff --git a/ruoyi-service/ruoyi-admin/src/main/java/com/ruoyi/admin/service/impl/OrderServiceImpl.java b/ruoyi-service/ruoyi-admin/src/main/java/com/ruoyi/admin/service/impl/OrderServiceImpl.java
index cd54160..3259f5c 100644
--- a/ruoyi-service/ruoyi-admin/src/main/java/com/ruoyi/admin/service/impl/OrderServiceImpl.java
+++ b/ruoyi-service/ruoyi-admin/src/main/java/com/ruoyi/admin/service/impl/OrderServiceImpl.java
@@ -217,6 +217,7 @@
orderInfo.setOrderNumber(order.getOrderNumber());
orderInfo.setPlaceOrderTime(order.getCreateTime());
orderInfo.setState(order.getState());
+ orderInfo.setCompleteTime(order.getCompleteTime());
orderInfo.setReservationRemark(order.getReservationRemark());
}
result.setOrderInfo(orderInfo);
@@ -248,8 +249,7 @@
*/
@Override
public List<String> queryIdList(OrderQueryRequest orderQueryRequest) {
- // 基础查询
- Page<com.ruoyi.order.api.entity.Order> pageList = orderClient.queryPage(orderQueryRequest).getData();
- return pageList.getRecords().stream().map(com.ruoyi.order.api.entity.Order::getId).collect(Collectors.toList());
+ List<String> data = orderClient.queryPage1(orderQueryRequest).getData();
+ return data;
}
}
--
Gitblit v1.7.1