From a9d35cb954187ca50439c5540aa4b6a8ec4435f0 Mon Sep 17 00:00:00 2001
From: wangw <1594593906@qq.com>
Date: Thu, 16 Apr 2026 15:10:49 +0800
Subject: [PATCH] =?UTF-8?q?=E7=A9=BA=E6=8C=87=E9=92=88?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

---
 .../impl/ShopProdStatisticServiceImpl.java      | 17 +++++++++++------
 1 file changed, 11 insertions(+), 6 deletions(-)

diff --git a/cash-service/order-service/src/main/java/com/czg/service/order/service/impl/ShopProdStatisticServiceImpl.java b/cash-service/order-service/src/main/java/com/czg/service/order/service/impl/ShopProdStatisticServiceImpl.java
index 2a20759e5..2a489ee3d 100644
--- a/cash-service/order-service/src/main/java/com/czg/service/order/service/impl/ShopProdStatisticServiceImpl.java
+++ b/cash-service/order-service/src/main/java/com/czg/service/order/service/impl/ShopProdStatisticServiceImpl.java
@@ -112,8 +112,13 @@ public class ShopProdStatisticServiceImpl extends ServiceImpl<ShopProdStatisticM
         }
         printDTO.setStatisticsTime(statisticsTime);
         printDTO.setOperator(param.getOperator());
-        printDTO.setTotalProductCount(saleSummaryCountVo.getSaleCount());
-        printDTO.setTotalActualAmount(saleSummaryCountVo.getTotalAmount());
+        if (saleSummaryCountVo != null) {
+            printDTO.setTotalProductCount(saleSummaryCountVo.getSaleCount());
+            printDTO.setTotalActualAmount(saleSummaryCountVo.getTotalAmount());
+        }else {
+            printDTO.setTotalProductCount(BigDecimal.ZERO);
+            printDTO.setTotalActualAmount(BigDecimal.ZERO);
+        }
 
         // 4. 先按分类ID分组商品
         Map<Long, List<ShopProdStatistic>> groupByCategory = prodStatisticList.stream()
@@ -152,10 +157,10 @@ public class ShopProdStatisticServiceImpl extends ServiceImpl<ShopProdStatisticM
             // 构建分类项
             ProductReportPrintDTO.CategoryItem categoryItem = new ProductReportPrintDTO.CategoryItem();
             categoryItem.setCategoryName(categoryName);
-            categoryItem.setNumber(categoryTotalNumber);          // 分类总数量
-            categoryItem.setActualAmount(categoryTotalActual);    // 分类总实收
-            categoryItem.setSalesAmount(categoryTotalSales);      // 分类总销售额
-            categoryItem.setProductItems(productItems);            // 分类下商品
+            categoryItem.setNumber(categoryTotalNumber);
+            categoryItem.setActualAmount(categoryTotalActual);
+            categoryItem.setSalesAmount(categoryTotalSales);
+            categoryItem.setProductItems(productItems);
 
             categoryItems.add(categoryItem);
         }