From 40616c5802932c2216e97a44ec9abed182590bbe Mon Sep 17 00:00:00 2001
From: seatonwan9
Date: 星期四, 28 八月 2025 15:46:40 +0800
Subject: [PATCH] 更新代码
---
src/main/java/com/webmanage/service/impl/OrderInfoServiceImpl.java | 28 +++++++++++++++++++++-------
1 files changed, 21 insertions(+), 7 deletions(-)
diff --git a/src/main/java/com/webmanage/service/impl/OrderInfoServiceImpl.java b/src/main/java/com/webmanage/service/impl/OrderInfoServiceImpl.java
index 552ce54..459acd4 100644
--- a/src/main/java/com/webmanage/service/impl/OrderInfoServiceImpl.java
+++ b/src/main/java/com/webmanage/service/impl/OrderInfoServiceImpl.java
@@ -162,7 +162,7 @@
}
@Override
- public PageResult<OrderInfo> getPendingApprovalOrderPage(OrderQueryDTO queryDTO) {
+ public PageResult<OrderDetailVO> getPendingApprovalOrderPage(OrderQueryDTO queryDTO) {
// 鍒涘缓鍒嗛〉瀵硅薄
Page<OrderInfo> page = new Page<>(queryDTO.getPageNum(), queryDTO.getPageSize());
@@ -175,13 +175,27 @@
queryDTO.getOrderBy(), queryDTO.getOrderDirection()
);
+ // 灏嗚鍗曚笌璇︽儏鑱旇〃灏佽鍒癡O
+ List<OrderDetailVO> voList = result.getRecords().stream().map(order -> {
+ OrderDetailVO vo = new OrderDetailVO();
+ BeanUtils.copyProperties(order, vo);
+ List<OrderDetail> details = orderDetailMapper.selectByOrderId(order.getOrderId());
+ List<OrderDetailItemVO> items = details.stream().map(d -> {
+ OrderDetailItemVO item = new OrderDetailItemVO();
+ BeanUtils.copyProperties(d, item);
+ return item;
+ }).collect(java.util.stream.Collectors.toList());
+ vo.setOrderDetails(items);
+ return vo;
+ }).collect(java.util.stream.Collectors.toList());
+
// 鏋勫缓杩斿洖缁撴灉
- return new PageResult<OrderInfo>(
- result.getRecords(),
- result.getTotal(),
- queryDTO.getPageNum().longValue(),
- queryDTO.getPageSize().longValue(),
- result.getPages()
+ return new PageResult<OrderDetailVO>(
+ voList,
+ result.getTotal(),
+ queryDTO.getPageNum().longValue(),
+ queryDTO.getPageSize().longValue(),
+ result.getPages()
);
}
--
Gitblit v1.8.0