From 289f205ba0612982eb13014b18bff2d3e9d6b211 Mon Sep 17 00:00:00 2001
From: Joshi <3040996759@qq.com>
Date: Mon, 29 Dec 2025 17:00:59 +0800
Subject: [PATCH] =?UTF-8?q?refactor(crm):=20=E9=87=8D=E6=9E=84=E9=94=80?=
 =?UTF-8?q?=E5=94=AE=E6=8A=A5=E8=A1=A8=E8=AE=A2=E5=8D=95=E6=98=8E=E7=BB=86?=
 =?UTF-8?q?=E6=9F=A5=E8=AF=A2=E6=96=B9=E6=B3=95?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

- 移除 queryOrderDetailPageList 方法中的重复代码
- 调整 queryOrderDetailList 方法的返回值处理逻辑
- 优化订单明细列表的查询和数据构建流程
- 保持原有的注解和接口实现不变
---
 .../impl/CrmSalesReportServiceImpl.java       | 19 +++++++++----------
 1 file changed, 9 insertions(+), 10 deletions(-)

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<CrmSalesReportVo.OrderDetail> queryOrderDetailPageList(CrmSalesReportBo bo, PageQuery pageQuery) {
         PageHelper.startPage(pageQuery.getPageNum(), pageQuery.getPageSize());
-        List<CrmSalesReportVo.OrderDetail> list = baseMapper.selectOrderDetailList(bo);
-        return TableDataInfo.build(list);
-    }
-
-    /**
-     * 查询销售报表订单明细列表
-     */
-    @Override
-    public List<CrmSalesReportVo.OrderDetail> queryOrderDetailList(CrmSalesReportBo bo) {
         List<CrmSalesReportVo.OrderDetail> 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<CrmSalesReportVo.OrderDetail> queryOrderDetailList(CrmSalesReportBo bo) {
+        return baseMapper.selectOrderDetailList(bo);
     }
 
     /**