diff --git a/eladmin-system/src/main/java/cn/ysk/cashier/controller/shop/SummaryByDayController.java b/eladmin-system/src/main/java/cn/ysk/cashier/controller/shop/SummaryByDayController.java
index 7f0812c3..f00b3ea6 100644
--- a/eladmin-system/src/main/java/cn/ysk/cashier/controller/shop/SummaryByDayController.java
+++ b/eladmin-system/src/main/java/cn/ysk/cashier/controller/shop/SummaryByDayController.java
@@ -42,10 +42,8 @@ public class SummaryByDayController {
     }
 
     @GetMapping(value = "count")
-    public List<TbOrderPayCountVo> summaryCount(ShopSummaryDto summaryDto,
-                                                @RequestParam(required = false) @DateTimeFormat(pattern = "yyyy-MM-dd HH:mm:ss") Date startTime,
-                                                @RequestParam(required = false) @DateTimeFormat(pattern = "yyyy-MM-dd HH:mm:ss") Date endTime) {
-        return summaryService.summaryCount(summaryDto, startTime, endTime);
+    public List<TbOrderPayCountVo> summaryCount(ShopSummaryDto summaryDto) {
+        return summaryService.summaryCount(summaryDto);
     }
 
 }
diff --git a/eladmin-system/src/main/java/cn/ysk/cashier/mybatis/entity/Activate.java b/eladmin-system/src/main/java/cn/ysk/cashier/mybatis/entity/Activate.java
index f6714217..47efc722 100644
--- a/eladmin-system/src/main/java/cn/ysk/cashier/mybatis/entity/Activate.java
+++ b/eladmin-system/src/main/java/cn/ysk/cashier/mybatis/entity/Activate.java
@@ -23,4 +23,6 @@ public class Activate  extends Model<Activate> {
     private String handselType;
     private String isDel;
     private String isUser;
+
+
 }
diff --git a/eladmin-system/src/main/java/cn/ysk/cashier/service/SummaryService.java b/eladmin-system/src/main/java/cn/ysk/cashier/service/SummaryService.java
index f1e751a3..9c0cd5f1 100644
--- a/eladmin-system/src/main/java/cn/ysk/cashier/service/SummaryService.java
+++ b/eladmin-system/src/main/java/cn/ysk/cashier/service/SummaryService.java
@@ -37,7 +37,7 @@ public interface SummaryService {
      */
     void download(ShopSummaryDto summaryDto, HttpServletResponse response) throws IOException;
 
-    List<TbOrderPayCountVo> summaryCount(ShopSummaryDto summaryDto, Date startTime, Date endTime);
+    List<TbOrderPayCountVo> summaryCount(ShopSummaryDto summaryDto);
 
     List<ShopTableSaleInfoVo> selectSummaryTable(Integer shopId, Date startTime, Date endTime);
 
diff --git a/eladmin-system/src/main/java/cn/ysk/cashier/service/impl/SummaryServiceImpl.java b/eladmin-system/src/main/java/cn/ysk/cashier/service/impl/SummaryServiceImpl.java
index 3540f315..7e0dbaf7 100644
--- a/eladmin-system/src/main/java/cn/ysk/cashier/service/impl/SummaryServiceImpl.java
+++ b/eladmin-system/src/main/java/cn/ysk/cashier/service/impl/SummaryServiceImpl.java
@@ -15,6 +15,7 @@ import cn.ysk.cashier.service.SummaryService;
 import cn.ysk.cashier.utils.DateUtil;
 import cn.ysk.cashier.utils.FileUtil;
 import cn.ysk.cashier.vo.*;
+import com.alibaba.fastjson.JSONObject;
 import lombok.RequiredArgsConstructor;
 import lombok.extern.slf4j.Slf4j;
 import org.apache.commons.lang3.StringUtils;
@@ -450,16 +451,16 @@ public class SummaryServiceImpl implements SummaryService {
     }
 
     @Override
-    public List<TbOrderPayCountVo> summaryCount(ShopSummaryDto summaryDto, Date startTime, Date endTime) {
+    public List<TbOrderPayCountVo> summaryCount(ShopSummaryDto summaryDto) {
         List<TbOrderPayCountVo> list = new ArrayList<>();
         Long start = 1704038400000L;
         Long end = Instant.now().toEpochMilli();
-        if (startTime != null || endTime != null) {
-            start = startTime.getTime();
-            end = endTime.getTime();
+        if (summaryDto.getStartTime() != null || summaryDto.getEndTime() != null) {
+            start = summaryDto.getStartTime().getTime();
+            end = summaryDto.getEndTime().getTime();
         } else {
-            startTime = DateUtil.toDate(DateUtil.fromTimeStamp(1704038400L));
-            endTime = new Date();
+            summaryDto.setStartTime(DateUtil.toDate(DateUtil.fromTimeStamp(1704038400L)));
+            summaryDto.setEndTime(new Date());
         }
         if (summaryDto.getType() != null && summaryDto.getType() == 1) {
             TbOrderPayCountVo payCount = tbOrderInfoRepository.queryOrderPayCount(summaryDto.getShopId(), start, end);
@@ -474,7 +475,7 @@ public class SummaryServiceImpl implements SummaryService {
             refCount.setIcon("el-icon-money");
             list.add(refCount);
 
-            TbOrderSalesCountByDayVo numCount = detailRepository.queryTbOrderSalesCount(Integer.valueOf(summaryDto.getShopId()), startTime, endTime);
+            TbOrderSalesCountByDayVo numCount = detailRepository.queryTbOrderSalesCount(Integer.valueOf(summaryDto.getShopId()), summaryDto.getStartTime(), summaryDto.getEndTime());
             TbOrderPayCountVo salesNum =new TbOrderPayCountVo("el-icon-goods","销售量","0",numCount.getSalesNum()-numCount.getRefNum());
             TbOrderPayCountVo refNum =new TbOrderPayCountVo("el-icon-goods","退单量","0",numCount.getRefNum());
             list.add(salesNum);