From 3848beb184b2b87b589b48d28935619f391b11b3 Mon Sep 17 00:00:00 2001
From: wangw <1594593906@qq.com>
Date: Wed, 22 Apr 2026 11:12:24 +0800
Subject: [PATCH] =?UTF-8?q?=E6=95=B0=E6=8D=AE=E6=89=93=E5=8D=B0?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

---
 .../com/czg/controller/admin/FinanceStsController.java     | 7 +++++++
 .../service/order/service/impl/FinanceStsServiceImpl.java  | 3 +++
 2 files changed, 10 insertions(+)

diff --git a/cash-api/order-server/src/main/java/com/czg/controller/admin/FinanceStsController.java b/cash-api/order-server/src/main/java/com/czg/controller/admin/FinanceStsController.java
index f581253e4..1a77410fe 100644
--- a/cash-api/order-server/src/main/java/com/czg/controller/admin/FinanceStsController.java
+++ b/cash-api/order-server/src/main/java/com/czg/controller/admin/FinanceStsController.java
@@ -5,6 +5,7 @@ import com.czg.order.param.FinanceStsQueryParam;
 import com.czg.order.param.SaleSummaryCountParam;
 import com.czg.order.service.FinanceStsService;
 import com.czg.resp.CzgResult;
+import com.czg.sa.StpKit;
 import jakarta.annotation.Resource;
 import jakarta.servlet.http.HttpServletResponse;
 import org.springframework.validation.annotation.Validated;
@@ -46,6 +47,9 @@ public class FinanceStsController {
      */
     @GetMapping("/printDayReport")
     public CzgResult<Void> printDayReport(SaleSummaryCountParam param) {
+        if (param.getShopId() == null) {
+            param.setShopId(StpKit.USER.getShopId());
+        }
         financeStsService.printDayReport(param);
         return CzgResult.success();
     }
@@ -55,6 +59,9 @@ public class FinanceStsController {
      */
     @GetMapping("/printDaySettle")
     public CzgResult<Void> printDaySettle(SaleSummaryCountParam param) {
+        if (param.getShopId() == null) {
+            param.setShopId(StpKit.USER.getShopId());
+        }
         financeStsService.printDaySettle(param);
         return CzgResult.success();
     }
diff --git a/cash-service/order-service/src/main/java/com/czg/service/order/service/impl/FinanceStsServiceImpl.java b/cash-service/order-service/src/main/java/com/czg/service/order/service/impl/FinanceStsServiceImpl.java
index f05a00ae9..fa7e5a892 100644
--- a/cash-service/order-service/src/main/java/com/czg/service/order/service/impl/FinanceStsServiceImpl.java
+++ b/cash-service/order-service/src/main/java/com/czg/service/order/service/impl/FinanceStsServiceImpl.java
@@ -143,6 +143,7 @@ public class FinanceStsServiceImpl implements FinanceStsService {
                 DayReportPrintDTO dayReportPrintDTO = new DayReportPrintDTO();
                 FinanceStsQueryParam financeStsQueryParam = new FinanceStsQueryParam();
                 financeStsQueryParam.setQueryDate(localDate);
+                financeStsQueryParam.setShopId(param.getShopId());
                 ShopOrderStatistic statisticData = getStatisticData(financeStsQueryParam);
                 // ====================== 核心：填充DTO ======================
                 // 1. 填充基础信息
@@ -228,6 +229,8 @@ public class FinanceStsServiceImpl implements FinanceStsService {
                 DaySettlePrintDTO printDTO = new DaySettlePrintDTO();
                 FinanceStsQueryParam param1 = new FinanceStsQueryParam();
                 param1.setQueryDate(localDate);
+                param1.setShopId(param.getShopId());
+
                 ShopOrderStatistic data = getStatisticData(param1);
                 printDTO.setOperator(param.getOperator());
                 // ===================== 1.基础信息 =====================