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 fd97eb4cb..121689edb 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
@@ -17,6 +17,7 @@ import com.czg.validator.ValidatorUtil;
 import com.czg.validator.group.DefaultGroup;
 import jakarta.annotation.Resource;
 import lombok.AllArgsConstructor;
+import org.springframework.validation.annotation.Validated;
 import org.springframework.web.bind.annotation.GetMapping;
 import org.springframework.web.bind.annotation.RequestMapping;
 import org.springframework.web.bind.annotation.RequestParam;
@@ -49,12 +50,11 @@ public class DataSummaryController {
     @GetMapping("trade")
     @OperationLog("营业板块-上半部分")
     @SaAdminCheckPermission(value = "dataSummary:trade", name = "营业板块-上半部分")
-    public CzgResult<ShopOrderStatistic> getTradeData(DataSummaryTradeParam param) {
+    public CzgResult<ShopOrderStatistic> getTradeData(@Validated DataSummaryTradeParam param) {
         Boolean hasKey = redisService.hasKey("task:statistic:date:");
         if (hasKey) {
             return CzgResult.failure("数据统计任务正在运行中，请稍后再试");
         }
-        ValidatorUtil.validateEntity(param, DefaultGroup.class);
         Long shopId = StpKit.USER.getShopId();
         if (param.getShopId() == null) {
             param.setShopId(shopId);
@@ -69,8 +69,7 @@ public class DataSummaryController {
     @GetMapping("productSaleDate")
     @OperationLog("商品销售-右下")
     @SaAdminCheckPermission(value = "dataSummary:productSaleData", name = "商品销售-右下")
-    public CzgResult<List<ShopProdStatistic>> getProductSaleData(DataSummaryTradeParam param) {
-        ValidatorUtil.validateEntity(param, DefaultGroup.class);
+    public CzgResult<List<ShopProdStatistic>> getProductSaleData(@Validated DataSummaryTradeParam param) {
         Long shopId = StpKit.USER.getShopId();
         if (param.getShopId() == null) {
             param.setShopId(shopId);
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 a94faa746..85ccbcf92 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
@@ -14,6 +14,7 @@ import com.czg.sa.StpKit;
 import com.pig4cloud.plugin.excel.annotation.ResponseExcel;
 import jakarta.annotation.Resource;
 import lombok.AllArgsConstructor;
+import org.springframework.validation.annotation.Validated;
 import org.springframework.web.bind.annotation.GetMapping;
 import org.springframework.web.bind.annotation.RequestMapping;
 import org.springframework.web.bind.annotation.RestController;
@@ -41,7 +42,7 @@ public class TableSummaryController {
     @GetMapping("list")
     @OperationLog("统计")
     //@SaAdminCheckPermission("tableSummary:list")
-    public CzgResult<List<ShopTableOrderStatistic>> summaryList(DataSummaryTradeParam param) {
+    public CzgResult<List<ShopTableOrderStatistic>> summaryList(@Validated DataSummaryTradeParam param) {
         Long shopId = StpKit.USER.getShopId();
         if (param.getShopId() == null) {
             param.setShopId(shopId);
@@ -58,7 +59,7 @@ public class TableSummaryController {
     @OperationLog("导出")
     //@SaAdminCheckPermission("tableSummary:export")
     public List<TableSummaryExportVo> summaryExport(TableSummaryParam param) {
-        Long shopId = StpKit.USER.getShopId(0L);
+        Long shopId = StpKit.USER.getShopId();
         if (param.getShopId() == null) {
             param.setShopId(shopId);
         }
diff --git a/cash-common/cash-common-service/src/main/java/com/czg/order/param/DataSummaryTradeParam.java b/cash-common/cash-common-service/src/main/java/com/czg/order/param/DataSummaryTradeParam.java
index dbc613de6..b44146fa2 100644
--- a/cash-common/cash-common-service/src/main/java/com/czg/order/param/DataSummaryTradeParam.java
+++ b/cash-common/cash-common-service/src/main/java/com/czg/order/param/DataSummaryTradeParam.java
@@ -2,6 +2,7 @@ package com.czg.order.param;
 
 import com.czg.validator.group.DefaultGroup;
 import jakarta.validation.constraints.NotBlank;
+import jakarta.validation.constraints.NotNull;
 import lombok.Data;
 
 import java.io.Serial;
@@ -23,12 +24,12 @@ public class DataSummaryTradeParam implements Serializable {
     /**
      * 开始时间 格式：yyyy-MM-dd
      */
-    @NotBlank(message = "开始日期不能为空", groups = DefaultGroup.class)
+    @NotNull(message = "开始日期不能为空")
     private LocalDate beginDate;
     /**
      * 结束时间 格式：yyyy-MM-dd
      */
-    @NotBlank(message = "结束日期不能为空", groups = DefaultGroup.class)
+    @NotNull(message = "结束日期不能为空")
     private LocalDate endDate;
     /**
      *  时间范围类型
@@ -40,6 +41,7 @@ public class DataSummaryTradeParam implements Serializable {
      *  THIS_MONTH   本月
      *  CUSTOM       自定义时间范围
      */
+    @NotBlank(message = "时间范围类型不能为空")
     private String rangeType;
     /**
      * 店铺id