Merge remote-tracking branch 'origin/master-v2' into master-v2

gongzuming

2024-09-13 778beabb28bd760a9fc466aaed537eb98e777982

 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();