From 57d4c8f794dd7829213f89f0f916d0c22d182b40 Mon Sep 17 00:00:00 2001
From: wangw <1594593906@qq.com>
Date: Mon, 24 Nov 2025 14:04:31 +0800
Subject: [PATCH] =?UTF-8?q?=E6=97=A5=E6=9C=9F=E8=8C=83=E5=9B=B4?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

---
 .../com/czg/controller/admin/DataSummaryController.java  | 9 ++-------
 .../com/czg/order/service/ShopProdStatisticService.java  | 5 +----
 .../order/service/impl/ShopProdStatisticServiceImpl.java | 8 +++++---
 3 files changed, 8 insertions(+), 14 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 121689edb..6375a2b56 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
@@ -13,8 +13,6 @@ import com.czg.resp.CzgResult;
 import com.czg.sa.StpKit;
 import com.czg.service.RedisService;
 import com.czg.utils.AssertUtil;
-import com.czg.validator.ValidatorUtil;
-import com.czg.validator.group.DefaultGroup;
 import jakarta.annotation.Resource;
 import lombok.AllArgsConstructor;
 import org.springframework.validation.annotation.Validated;
@@ -69,12 +67,9 @@ public class DataSummaryController {
     @GetMapping("productSaleDate")
     @OperationLog("商品销售-右下")
     @SaAdminCheckPermission(value = "dataSummary:productSaleData", name = "商品销售-右下")
-    public CzgResult<List<ShopProdStatistic>> getProductSaleData(@Validated DataSummaryTradeParam param) {
+    public CzgResult<List<ShopProdStatistic>> getProductSaleData(@RequestParam Integer day) {
         Long shopId = StpKit.USER.getShopId();
-        if (param.getShopId() == null) {
-            param.setShopId(shopId);
-        }
-        List<ShopProdStatistic> data = prodStatisticService.getArchiveTradeDataBy20(param.getShopId(), param.getRangeType(), param.getBeginDate(), param.getEndDate());
+        List<ShopProdStatistic> data = prodStatisticService.getArchiveTradeDataBy20(shopId,day);
         return CzgResult.success(data);
     }
 
diff --git a/cash-common/cash-common-service/src/main/java/com/czg/order/service/ShopProdStatisticService.java b/cash-common/cash-common-service/src/main/java/com/czg/order/service/ShopProdStatisticService.java
index a6402bce8..39cc0511d 100644
--- a/cash-common/cash-common-service/src/main/java/com/czg/order/service/ShopProdStatisticService.java
+++ b/cash-common/cash-common-service/src/main/java/com/czg/order/service/ShopProdStatisticService.java
@@ -18,7 +18,6 @@ public interface ShopProdStatisticService extends IService<ShopProdStatistic> {
     /**
      * 统计一段时间内的商品交易数据
      *
-     * @param param 入参
      * @return 商品数据
      */
     SaleSummaryCountVo summaryCount(Long shopId, String productName, String rangeType, LocalDate start, LocalDate end);
@@ -40,14 +39,12 @@ public interface ShopProdStatisticService extends IService<ShopProdStatistic> {
      * @return 商品数据
      */
     List<ShopProdStatistic> getArchiveTradeData(Long shopId, String productName, String rangeType, LocalDate start, LocalDate end);
-    List<ShopProdStatistic> getArchiveTradeDataBy20(Long shopId, String rangeType, LocalDate start, LocalDate end);
+    List<ShopProdStatistic> getArchiveTradeDataBy20(Long shopId, Integer day);
 
     //------------------------------------------------------------下列为 后台使用------------------------------------------------------------
 
     /**
      * 统计某天数据并插入数据库
-     *
-     * @param day
      */
     void statisticAndInsert(Long shopId, LocalDate day);
 
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 700b78e05..39a4c998f 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
@@ -31,8 +31,10 @@ import java.util.stream.Stream;
 public class ShopProdStatisticServiceImpl extends ServiceImpl<ShopProdStatisticMapper, ShopProdStatistic> implements ShopProdStatisticService {
 
     @Override
-    public List<ShopProdStatistic> getArchiveTradeDataBy20(Long shopId, String rangeType, LocalDate start, LocalDate end) {
-        List<ShopProdStatistic> archiveTradeData = getArchiveTradeData(shopId, null, rangeType, start, end);
+    public List<ShopProdStatistic> getArchiveTradeDataBy20(Long shopId, Integer day) {
+        LocalDate currentDate = LocalDate.now();
+        LocalDate startDate = currentDate.minusDays(day - 1);
+        List<ShopProdStatistic> archiveTradeData = getArchiveTradeData(shopId, null, "", startDate, currentDate);
         // 按照 saleCount 降序排序
         return archiveTradeData.stream()
                 .sorted(
@@ -110,7 +112,7 @@ public class ShopProdStatisticServiceImpl extends ServiceImpl<ShopProdStatisticM
             realTimeData = realTimeData.stream()
                     .filter(ShopProdStatistic::isValid)
                     .toList();
-            if(CollUtil.isNotEmpty(realTimeData)) {
+            if (CollUtil.isNotEmpty(realTimeData)) {
                 boolean exists = exists(QueryWrapper.create().eq(ShopProdStatistic::getShopId, shopId).eq(ShopProdStatistic::getCreateDay, day));
                 if (exists) {
                     remove(QueryWrapper.create().eq(ShopProdStatistic::getShopId, shopId).eq(ShopProdStatistic::getCreateDay, day));