From 1e8c1e03e917075d66f64ef06fb436da42079aa8 Mon Sep 17 00:00:00 2001
From: wangw <1594593906@qq.com>
Date: Tue, 9 Dec 2025 11:41:45 +0800
Subject: [PATCH] =?UTF-8?q?=E7=BB=9F=E8=AE=A1=20=E4=BC=A0=E5=8F=82?=
 =?UTF-8?q?=E9=97=AE=E9=A2=98?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

---
 .../com/czg/controller/admin/DataSummaryController.java  | 9 +++++----
 .../com/czg/controller/admin/SaleSummaryController.java  | 9 +++------
 .../com/czg/controller/admin/TableSummaryController.java | 3 +--
 3 files changed, 9 insertions(+), 12 deletions(-)

diff --git a/cash-api/order-server/src/main/java/com/czg/controller/admin/DataSummaryController.java b/cash-api/order-server/src/main/java/com/czg/controller/admin/DataSummaryController.java
index 1bd970ad7..d05678dc9 100644
--- a/cash-api/order-server/src/main/java/com/czg/controller/admin/DataSummaryController.java
+++ b/cash-api/order-server/src/main/java/com/czg/controller/admin/DataSummaryController.java
@@ -53,9 +53,8 @@ public class DataSummaryController {
         if (hasKey) {
             return CzgResult.failure("数据统计任务正在运行中，请稍后再试");
         }
-        Long shopId = StpKit.USER.getShopId();
         if (param.getShopId() == null) {
-            param.setShopId(shopId);
+            param.setShopId(StpKit.USER.getShopId());
         }
         ShopOrderStatistic data = orderStatisticService.getArchiveTradeData(param.getShopId(), param.getRangeType(), param.getBeginDate(), param.getEndDate());
         return CzgResult.success(data);
@@ -66,8 +65,10 @@ public class DataSummaryController {
      */
     @GetMapping("productSaleDate")
     @SaAdminCheckPermission(value = "dataSummary:productSaleData", name = "商品销售-右下")
-    public CzgResult<List<ShopProdStatistic>> getProductSaleData(@RequestParam Integer day) {
-        Long shopId = StpKit.USER.getShopId();
+    public CzgResult<List<ShopProdStatistic>> getProductSaleData(@RequestParam Integer day,@RequestParam(required = false) Long shopId) {
+        if (shopId == null) {
+            shopId = StpKit.USER.getShopId();
+        }
         List<ShopProdStatistic> data = prodStatisticService.getArchiveTradeDataBy10(shopId,day);
         return CzgResult.success(data);
     }
diff --git a/cash-api/order-server/src/main/java/com/czg/controller/admin/SaleSummaryController.java b/cash-api/order-server/src/main/java/com/czg/controller/admin/SaleSummaryController.java
index 67a1db64c..648cf51c8 100644
--- a/cash-api/order-server/src/main/java/com/czg/controller/admin/SaleSummaryController.java
+++ b/cash-api/order-server/src/main/java/com/czg/controller/admin/SaleSummaryController.java
@@ -38,9 +38,8 @@ public class SaleSummaryController {
     @OperationLog("统计")
     //@SaAdminCheckPermission("saleSummary:count")
     public CzgResult<SaleSummaryCountVo> summaryCount(SaleSummaryCountParam param) {
-        Long shopId = StpKit.USER.getShopId();
         if (param.getShopId() == null) {
-            param.setShopId(shopId);
+            param.setShopId(StpKit.USER.getShopId());
         }
         SaleSummaryCountVo data = prodStatisticService.summaryCount(param);
         return CzgResult.success(data);
@@ -53,9 +52,8 @@ public class SaleSummaryController {
     @OperationLog("分页")
     //@SaAdminCheckPermission("saleSummary:page")
     public CzgResult<List<ShopProdStatistic>> summaryPage(SaleSummaryCountParam param) {
-        Long shopId = StpKit.USER.getShopId();
         if (param.getShopId() == null) {
-            param.setShopId(shopId);
+            param.setShopId(StpKit.USER.getShopId());
         }
         List<ShopProdStatistic> list = prodStatisticService.getArchiveTradeData(param);
         return CzgResult.success(list);
@@ -64,9 +62,8 @@ public class SaleSummaryController {
     @ResponseExcel(name = "销售统计明细")
     @GetMapping("/export")
     public List<ShopProdStatistic> summaryExport(SaleSummaryCountParam param) {
-        Long shopId = StpKit.USER.getShopId();
         if (param.getShopId() == null) {
-            param.setShopId(shopId);
+            param.setShopId(StpKit.USER.getShopId());
         }
         return prodStatisticService.getArchiveTradeData(param);
     }
diff --git a/cash-api/order-server/src/main/java/com/czg/controller/admin/TableSummaryController.java b/cash-api/order-server/src/main/java/com/czg/controller/admin/TableSummaryController.java
index 85ccbcf92..0faa5c824 100644
--- a/cash-api/order-server/src/main/java/com/czg/controller/admin/TableSummaryController.java
+++ b/cash-api/order-server/src/main/java/com/czg/controller/admin/TableSummaryController.java
@@ -59,9 +59,8 @@ public class TableSummaryController {
     @OperationLog("导出")
     //@SaAdminCheckPermission("tableSummary:export")
     public List<TableSummaryExportVo> summaryExport(TableSummaryParam param) {
-        Long shopId = StpKit.USER.getShopId();
         if (param.getShopId() == null) {
-            param.setShopId(shopId);
+            param.setShopId(StpKit.USER.getShopId());
         }
         return tableSummaryService.summaryExportList(param);
     }