From b2abaed3c8cb16caa5d60c6f5394ed34990b1a81 Mon Sep 17 00:00:00 2001
From: gong <1157756119@qq.com>
Date: Mon, 8 Dec 2025 17:03:31 +0800
Subject: [PATCH] =?UTF-8?q?=E5=88=A0=E9=99=A4=E5=A4=9A=E4=BD=99=20if=20-?=
 =?UTF-8?q?=20else?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

---
 .../impl/ShopProdStatisticServiceImpl.java    | 50 +++++++++----------
 1 file changed, 24 insertions(+), 26 deletions(-)

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 96442e03b..8a178a1b0 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
@@ -80,34 +80,32 @@ public class ShopProdStatisticServiceImpl extends ServiceImpl<ShopProdStatisticM
     public List<ShopProdStatistic> getArchiveTradeData(SaleSummaryCountParam param) {
         LocalDate currentDate = LocalDate.now();
         param.setProductName(CzgStrUtils.getStrOrNull(param.getProductName()));
-        List<ShopProdStatistic> resultList;
         if ("today".equals(param.getRangeType())) {
-            resultList = getRealTimeDataByDay(param.getShopId(), currentDate, param.getProductName(), param.getCategoryId());
-        } else if ("yesterday".equals(param.getRangeType())) {
-            resultList = getProdStatSingleDate(param.getShopId(), currentDate.minusDays(1),
-                    param.getProductName(), param.getCategoryId());
-        } else {
-            if (param.getBeginDate().isAfter(currentDate)) {
-                throw new CzgException("开始时间不能晚于当前时间");
-            }
-            if (param.getBeginDate().equals(param.getEndDate())) {
-                resultList = getProdStatSingleDate(param.getShopId(), param.getBeginDate(), param.getProductName(),
-                        param.getCategoryId());
-            } else {
-                if (param.getEndDate().isBefore(currentDate)) {
-                    resultList = getProdStatDateRange(param.getShopId(), param.getBeginDate(), param.getEndDate(),
-                            param.getProductName(), param.getCategoryId());
-                } else {
-                    List<ShopProdStatistic> realTimeDataByDay = getRealTimeDataByDay(param.getShopId(), currentDate,
-                            param.getProductName(), param.getCategoryId());
-                    List<ShopProdStatistic> dateRange = getProdStatDateRange(param.getShopId(), param.getBeginDate(),
-                            param.getEndDate(), param.getProductName(), param.getCategoryId());
-
-                    resultList = mergeProdStatistic(realTimeDataByDay, dateRange);
-                }
-            }
+            return getRealTimeDataByDay(param.getShopId(), currentDate, param.getProductName(), param.getCategoryId());
         }
-        return resultList;
+
+        if ("yesterday".equals(param.getRangeType())) {
+            return getProdStatSingleDate(param.getShopId(), currentDate.minusDays(1),
+                    param.getProductName(), param.getCategoryId());
+        }
+
+        if (param.getBeginDate().isAfter(currentDate)) {
+            throw new CzgException("开始时间不能晚于当前时间");
+        }
+        if (param.getBeginDate().equals(param.getEndDate())) {
+            return getProdStatSingleDate(param.getShopId(), param.getBeginDate(), param.getProductName(),
+                    param.getCategoryId());
+        }
+        if (param.getEndDate().isBefore(currentDate)) {
+            return getProdStatDateRange(param.getShopId(), param.getBeginDate(), param.getEndDate(),
+                    param.getProductName(), param.getCategoryId());
+        }
+        List<ShopProdStatistic> realTimeDataByDay = getRealTimeDataByDay(param.getShopId(), currentDate,
+                param.getProductName(), param.getCategoryId());
+        List<ShopProdStatistic> dateRange = getProdStatDateRange(param.getShopId(), param.getBeginDate(),
+                param.getEndDate(), param.getProductName(), param.getCategoryId());
+
+        return mergeProdStatistic(realTimeDataByDay, dateRange);
     }