From 983c8fc9697223956db395af1b781ddb75c6e0b5 Mon Sep 17 00:00:00 2001
From: luxiaotao1123 <t1341870251@163.com>
Date: 星期一, 17 十月 2022 16:01:04 +0800
Subject: [PATCH] #
---
src/main/java/com/zy/asrs/service/impl/OrderServiceImpl.java | 9 ++++++---
1 files changed, 6 insertions(+), 3 deletions(-)
diff --git a/src/main/java/com/zy/asrs/service/impl/OrderServiceImpl.java b/src/main/java/com/zy/asrs/service/impl/OrderServiceImpl.java
index d15d0eb..9dec861 100644
--- a/src/main/java/com/zy/asrs/service/impl/OrderServiceImpl.java
+++ b/src/main/java/com/zy/asrs/service/impl/OrderServiceImpl.java
@@ -167,14 +167,17 @@
}
@Override
- public OrderMergeVo mergePreview(List<Long> ids) {
- OrderMergeVo vo = new OrderMergeVo();
+ public List<OrderMergeVo> mergePreview(List<Long> ids) {
+ List<OrderMergeVo> result = new ArrayList<>();
for (Long orderId : ids) {
Order order = this.selectById(orderId);
// 鑾峰彇鎵�鏈夋湭浣滀笟鐨勬槑缁�
+ List<OrderDetl> orderDetls = orderDetlService.selectRemainder(orderId);
+ for (OrderDetl orderDetl : orderDetls) {
+ }
}
- return vo;
+ return result;
}
}
--
Gitblit v1.9.1