diff --git a/klp-crm/src/main/java/com/klp/crm/service/impl/CrmSalesReportServiceImpl.java b/klp-crm/src/main/java/com/klp/crm/service/impl/CrmSalesReportServiceImpl.java index 4835a0c0..41c25ab0 100644 --- a/klp-crm/src/main/java/com/klp/crm/service/impl/CrmSalesReportServiceImpl.java +++ b/klp-crm/src/main/java/com/klp/crm/service/impl/CrmSalesReportServiceImpl.java @@ -56,15 +56,6 @@ public class CrmSalesReportServiceImpl implements ICrmSalesReportService { @Override public TableDataInfo queryOrderDetailPageList(CrmSalesReportBo bo, PageQuery pageQuery) { PageHelper.startPage(pageQuery.getPageNum(), pageQuery.getPageSize()); - List list = baseMapper.selectOrderDetailList(bo); - return TableDataInfo.build(list); - } - - /** - * 查询销售报表订单明细列表 - */ - @Override - public List queryOrderDetailList(CrmSalesReportBo bo) { List orderDetails = baseMapper.selectOrderDetailList(bo); if (StringUtils.isNotNull(orderDetails) && !orderDetails.isEmpty()) { // 提取所有订单ID @@ -94,7 +85,15 @@ public class CrmSalesReportServiceImpl implements ICrmSalesReportService { } } } - return orderDetails; + return TableDataInfo.build(orderDetails); + } + + /** + * 查询销售报表订单明细列表 + */ + @Override + public List queryOrderDetailList(CrmSalesReportBo bo) { + return baseMapper.selectOrderDetailList(bo); } /**