From 6c409986a37483f353613e4a6f62f74cb91f5b65 Mon Sep 17 00:00:00 2001
From: Cui Zhi Feng <cuizf@fengyuntec.com>
Date: 星期五, 13 九月 2024 19:02:39 +0800
Subject: [PATCH] 质检打印

---
 src/main/java/com/mzl/flower/service/payment/OrderService.java |    8 ++++----
 1 files changed, 4 insertions(+), 4 deletions(-)

diff --git a/src/main/java/com/mzl/flower/service/payment/OrderService.java b/src/main/java/com/mzl/flower/service/payment/OrderService.java
index 8994dcc..2ef01ff 100644
--- a/src/main/java/com/mzl/flower/service/payment/OrderService.java
+++ b/src/main/java/com/mzl/flower/service/payment/OrderService.java
@@ -802,10 +802,9 @@
                 orderIds.add(o.getId());
             }
 
-            List<OrderItem> itemList = orderItemMapper.selectList(
-                    new QueryWrapper<OrderItem>().in("order_id", orderIds));
+            List<OrderItemListDTO> itemList = orderItemMapper.getOrderItems(orderIds);
             Map<String, List<OrderItemListDTO>> map = new HashMap<>();
-            for (OrderItem oi : itemList) {
+            for (OrderItemListDTO oi : itemList) {
                 String orderId = oi.getOrderId();
                 List<OrderItemListDTO> ll = map.computeIfAbsent(orderId, k -> new ArrayList<>());
                 OrderItemListDTO d = new OrderItemListDTO();
@@ -929,8 +928,9 @@
                 if(llc == null){
                     llc = new OrderCheckLocationListDTO();
                     BeanUtils.copyProperties(c, llc);
-                    rMap.put(locationId, llc);
+                    llc.setTotalAmount(new BigDecimal(0));
 
+                    rMap.put(locationId, llc);
                     result.add(llc);
                 }
 

--
Gitblit v1.9.3