From bc0898f18e741571608176d89cdd16b94c781913 Mon Sep 17 00:00:00 2001 From: Helius <wangdoubleone@gmail.com> Date: Thu, 12 May 2022 10:25:42 +0800 Subject: [PATCH] fix money_card_use 默认储值卡处理 --- zq-erp/src/main/java/com/matrix/system/hive/service/imp/SysOrderServiceImpl.java | 9 ++++++++- 1 files changed, 8 insertions(+), 1 deletions(-) diff --git a/zq-erp/src/main/java/com/matrix/system/hive/service/imp/SysOrderServiceImpl.java b/zq-erp/src/main/java/com/matrix/system/hive/service/imp/SysOrderServiceImpl.java index 19b45ec..efe99c6 100644 --- a/zq-erp/src/main/java/com/matrix/system/hive/service/imp/SysOrderServiceImpl.java +++ b/zq-erp/src/main/java/com/matrix/system/hive/service/imp/SysOrderServiceImpl.java @@ -517,7 +517,14 @@ @Override public List<PadOrderDetailVo> findPadApiOrderListInPage(PadOrderListDto orderListDto, PaginationVO pageVo) { - return sysOrderDao.selectPadApiOrderListInPage(orderListDto, pageVo); + List<PadOrderDetailVo> padOrderDetailVos = sysOrderDao.selectPadApiOrderListInPage(orderListDto, pageVo); + if(CollUtil.isNotEmpty(padOrderDetailVos)){ + for(PadOrderDetailVo padOrderDetailVo : padOrderDetailVos){ + padOrderDetailVo.setItems(orderItemDao.selectApiOrderDetailItemsByOrderId(Long.parseLong(padOrderDetailVo.getOrderId()))); + } + } + + return padOrderDetailVos; } @Override -- Gitblit v1.9.1