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 |   15 +++++++++++++++
 1 files changed, 15 insertions(+), 0 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 a32f666..9dec861 100644
--- a/src/main/java/com/zy/asrs/service/impl/OrderServiceImpl.java
+++ b/src/main/java/com/zy/asrs/service/impl/OrderServiceImpl.java
@@ -13,6 +13,7 @@
 import com.zy.asrs.service.*;
 import com.baomidou.mybatisplus.service.impl.ServiceImpl;
 import com.zy.common.model.DetlDto;
+import com.zy.common.model.OrderMergeVo;
 import lombok.extern.slf4j.Slf4j;
 import org.springframework.beans.factory.annotation.Autowired;
 import org.springframework.stereotype.Service;
@@ -165,4 +166,18 @@
         return this.baseMapper.selectComplete();
     }
 
+    @Override
+    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 result;
+    }
+
 }

--
Gitblit v1.9.1